[Swingme-svn] SF.net SVN: swingme:[2659] SwingME/src/net/yura/mobile/gui

[<yu...@us...>]

Revision: 2659
          http://sourceforge.net/p/swingme/code/2659
Author:   yuranet
Date:     2022-10-02 12:54:08 +0000 (Sun, 02 Oct 2022)
Log Message:
-----------
make default button bigger and add SmallButton to nimbus

Modified Paths:
--------------
    SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java
    SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java

Modified: SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java	2022-10-01 23:10:07 UTC (rev 2658)
+++ SwingME/src/net/yura/mobile/gui/components/FrameTitlePane.java	2022-10-02 12:54:08 UTC (rev 2659)
@@ -99,6 +99,7 @@
                 }
             }
             Button b = new Button(icon);
+            b.setName("SmallButton");
             b.addActionListener(this);
             b.setActionCommand(action);
 

Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2022-10-01 23:10:07 UTC (rev 2658)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java	2022-10-02 12:54:08 UTC (rev 2659)
@@ -11,6 +11,7 @@
 import net.yura.mobile.gui.border.EmptyBorder;
 import net.yura.mobile.gui.border.LineBorder;
 import net.yura.mobile.gui.border.MatteBorder;
+import net.yura.mobile.gui.layout.XULLoader;
 import net.yura.mobile.gui.plaf.LookAndFeel;
 import net.yura.mobile.gui.plaf.MetalScrollBar;
 import net.yura.mobile.gui.plaf.Style;
@@ -171,14 +172,25 @@
         disabledBorderSettings.addElement(new NimbusBorderSetting(color18, color18, 1, 3, 1));
         disabledBorderSettings.addElement(new NimbusBorderSetting(color19, color20, 1, 2, 0.65));
 
-        setUIDefault("Button.border",new NimbusBorder(defaultBorderSettings));
+        setUIDefault("SmallButton.border",new NimbusBorder(defaultBorderSettings));
+        setUIDefault("SmallButton.background",noColor);
+        setUIDefault("SmallButton[focused].border",new NimbusBorder(focusedBorderSettings));
+        setUIDefault("SmallButton[selected].border",new NimbusBorder(selectedBorderSettings));
+        setUIDefault("SmallButton[selected].foreground",uiSettings.get("nimbusSelectedText"));
+        setUIDefault("SmallButton[focused+selected].foreground",uiSettings.get("nimbusSelectedText"));
+        setUIDefault("SmallButton[disabled].border",new NimbusBorder(disabledBorderSettings));
+        setUIDefault("SmallButton[disabled].foreground",uiSettings.get("inactiveCaption"));
+
+
+        int paddingX = XULLoader.adjustSizeToDensity(10);
+        int paddingY = XULLoader.adjustSizeToDensity(2);
+        setUIDefault("Button.border",new NimbusBorder(defaultBorderSettings, 0, 0, paddingX, paddingY));
         setUIDefault("Button.background",noColor);
-
-        setUIDefault("Button[focused].border",new NimbusBorder(focusedBorderSettings));
-        setUIDefault("Button[selected].border",new NimbusBorder(selectedBorderSettings));
+        setUIDefault("Button[focused].border",new NimbusBorder(focusedBorderSettings, 0, 0, paddingX, paddingY));
+        setUIDefault("Button[selected].border",new NimbusBorder(selectedBorderSettings, 0, 0, paddingX, paddingY));
         setUIDefault("Button[selected].foreground",uiSettings.get("nimbusSelectedText"));
         setUIDefault("Button[focused+selected].foreground",uiSettings.get("nimbusSelectedText"));
-        setUIDefault("Button[disabled].border",new NimbusBorder(disabledBorderSettings));
+        setUIDefault("Button[disabled].border",new NimbusBorder(disabledBorderSettings, 0, 0, paddingX, paddingY));
         setUIDefault("Button[disabled].foreground",uiSettings.get("inactiveCaption"));
 
         // ICON BUTTON SETTINGS

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.