Skip to content

Commit 353730b

Browse files
BobHansonBobHanson
committed
Adds CSS indeterminate progress bar animation; reverts
display:inline-block for button text (Chrome)
1 parent 463d4f3 commit 353730b

File tree

8 files changed

+867
-774
lines changed

8 files changed

+867
-774
lines changed

‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎

-477 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200613163403
1+
20200613212819

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip‎

-477 Bytes
Binary file not shown.

‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20200613163403
1+
20200613212819

‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎

-477 Bytes
Binary file not shown.

‎sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,9 +2808,9 @@ protected void setAlignments(AbstractButton b, boolean justGetPreferred) {
28082808
Object cssIcon = getJSObject();
28092809

28102810
addJSKeyVal(cssCtr, "position", "absolute", "top", null, "left", null, "transform", null, "width", (isHTML && isLabel ? "inherit" : wCtr + "px"),
2811-
"height", hCtr + "px", "display","inline-block");
2811+
"height", hCtr + "px", "display",(isLabel ? "inline-block" : null));
28122812
addJSKeyVal(cssIcon, "position", "absolute", "top", null, "left", null, "transform", null);
2813-
addJSKeyVal(cssTxt, "position", "absolute", "display","inline-block", "top", null, "left", null, "transform", null);
2813+
addJSKeyVal(cssTxt, "position", "absolute", "display",(isLabel ? "inline-block" : null), "top", null, "left", null, "transform", null);
28142814
// checkboxes and radiobuttons (i.e. with actionNodes) should not be fully centered unless in a table
28152815
isFullyCentered = (alignHCenter && alignVCenter && wIcon == 0
28162816
|| wText == 0 && (actionNode == null || this.cellComponent != null || isSimpleButton) && margins.left == margins.right

0 commit comments

Comments
 (0)