JSSPlitPaneUI fixes JSButtonUI CSS outline "none"

BobHanson · BobHanson · commit 1c2d463f7c2c · 2020-07-02T22:34:19.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSButtonUI.java
@@ -93,7 +93,7 @@ public DOMNode updateDOMNode() {
 			allowPaintedBackground = false;
 			setDoPropagate();
 			domNode = enableNode = buttonNode = newDOMObject("button", id + "_dom", "type", "button", "style", "padding:0");
-			DOMNode.setStyles(domNode, "outline", "none");
+			//DOMNode.setStyles(domNode, "outline", "none");
 			//DOMNode.setStyles(domNode,"transform","translateY(0.5px)translateX(0.5px)");
 			addClass(domNode, "j2sbutton");
 			setFocusable();
@@ -202,7 +202,7 @@ protected void setupButton() {
 		// "emptyBorder" is not really empty.
 		if (button.getBorder() == null || button.getBorder() == BorderFactory.emptyBorder)
 			DOMNode.setStyles(buttonNode, "border", "none");
-		else if (button.getBorder() == BorderFactory.html5Border || button.getBorder() instanceof UIResource)
+		else if (button.getBorder() == BorderFactory.html5Border)
 			DOMNode.setStyles(buttonNode, "border", null);
 //
 //		System.out.println(button.getText() + " " + button.getBorder());
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -431,17 +431,6 @@ protected void restoreCellNodes(DOMNode td) {
 	
  	public DOMNode menuAnchorNode;
 
-	/**
-	 * for SplitPaneDivider
-	 * 
-	 */
-	protected boolean draggable;
-
-	public void setDraggable(JSFunction f) {
-		// SplitPaneDivider
-		draggable = true; // never actually used
-		J2S.setDraggable(getDOMNode(), f);
-	}
 
    /**
 	 * a numerical reference for an ID
@@ -1393,7 +1382,7 @@ protected void propertyChangedCUI(PropertyChangeEvent e, String prop) {
 			return;
 		case "border":
 			// Simple Buttons have insets that don't overlap with the border.
-			if (!isSimpleButton)
+			//if (!isSimpleButton)
 				jc.秘setPaintsSelf(JSComponent.PAINTS_SELF_UNKNOWN);
 			setTainted();
 			return;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSplitPaneUI.java
@@ -267,6 +267,19 @@ private void enableDragging() {
 		setDraggable(fDrag);
 	}
 
+	/**
+	 * for SplitPaneDivider
+	 * 
+	 */
+	protected boolean draggable;
+
+	public void setDraggable(JSFunction f) {
+		// SplitPaneDivider
+		draggable = true; // never actually used
+		J2S.setDraggable(divider.秘getUI().getDOMNode(), f);
+	}
+
+	
 	/**
 	 * Installs the UI defaults.
 	 */
