AbstractButton.isContentAreaFilled fix

BobHanson · BobHanson · commit 5b6962243ed4 · 2021-09-07T19:11:59.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/ButtonListener.java
@@ -132,6 +132,9 @@ public void propertyChange(PropertyChangeEvent e) {
 	}
 
 	protected void checkOpacity(AbstractButton b) {
+		if (!b.isContentAreaFilled()) {
+				DOMNode.setStyles(ui.domNode, "border", "none", "outline", "none");
+		}
 		b.setOpaque(b.isContentAreaFilled());
 	}
 
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
@@ -212,6 +212,8 @@ protected void setupButton() {
 			DOMNode.setStyle(buttonNode, "border", "none");
 		else if (button.getBorder() == BorderFactory.html5Border)
 			DOMNode.setStyle(buttonNode, "border", null);
+		if (!button.isContentAreaFilled())
+			DOMNode.setStyles(domNode, "border", "none", "outline", "none");
 //
 //		System.out.println(button.getText() + " " + button.getBorder());
 		if (!isMenuSep) {
diff --git a/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java b/sources/net.sf.j2s.java.core/src/test/JalviewJSTest.java
@@ -430,10 +430,13 @@ public void actionPerformed(ActionEvent e) {
 		Label awtlabel = new Label("AWT");
 		awtlabel.setFont(font);
 		awtlabel.setAlignment(Label.LEFT);
+		
 //	firstColumn.add(awtlabel);
 		awtlabel.setBackground(Color.white);
 
 		JButton b1 = new JButton("right left");
+		b1.setContentAreaFilled(false);
+
 		b1.setIcon(getImage("test2.png"));
 		b1.setFont(font);
 		// totally ignored

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ public void propertyChange(PropertyChangeEvent e) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`protected void checkOpacity(AbstractButton b) {`
	`135`	`+ if (!b.isContentAreaFilled()) {`
	`136`	`+ DOMNode.setStyles(ui.domNode, "border", "none", "outline", "none");`
	`137`	`+ }`
`135`	`138`	`b.setOpaque(b.isContentAreaFilled());`
`136`	`139`	`}`
`137`	`140`