button: fixes when the button should paint the border in focus mode

Changelog-Fixed: button: fixes when the button should paint the border in focus mode

Reported-By: Zoya @zanderson9

Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>

Author: vincenzopalazzo

gradle.properties

@@ -1,7 +1,7 @@
 GROUP_ID=io.github.vincenzopalazzo
 ARTIFACT_ID=material-ui-swing
 #VERSION=1.1.2-rc2-SNAPSHOT
-VERSION=1.1.3-rc1-SNAPSHOT
+VERSION=1.1.3-rc2-SNAPSHOT
 MODULE_NAME=io.github.vincenzopalazzo.materialuiswing
 RELEASE_ENABLE=true
 

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.vincenzopalazzo</groupId>
   <artifactId>material-ui-swing</artifactId>
-  <version>1.1.3-rc1-SNAPSHOT</version>
+  <version>1.1.3-rc2-SNAPSHOT</version>
   <inceptionYear>2020</inceptionYear>
   <licenses>
     <license>

src/main/java/mdlaf/components/button/MaterialButtonUI.java

@@ -215,13 +215,6 @@ protected void paintFocus(
       Graphics g, AbstractButton b, Rectangle viewRect, Rectangle textRect, Rectangle iconRect) {
     if (!button.isEnabled()) return;
     paintFocusRing(g, (JButton) b);
-    // paintFocusBorder(g, (JButton) b);
-  }
-
-  @Override
-  public void update(Graphics g, JComponent c) {
-    super.update(g, c);
-    if (!button.isFocusOwner()) paintBorderButton(g, c);
   }
 
   @Override
@@ -277,37 +270,21 @@ protected void paintFocusRing(Graphics g, JButton b) {
     g2.dispose();
   }
 
-  @Deprecated
-  protected void paintFocusBorder(Graphics graphics, JButton b) {
-    if (!b.isEnabled() || !borderEnabled) {
-      return;
-    }
-    Color color;
-    if (defaultButton != null && defaultButton) {
-      color = UIManager.getColor("Button[Default][focus].color");
-    } else {
-      color = UIManager.getColor("Button[focus].color");
-    }
-    Graphics2D graphics2D = (Graphics2D) graphics.create();
-    graphics2D.setStroke(new BasicStroke(2f));
-
-    graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    int w = b.getWidth() - 1;
-    int h = b.getHeight() - 1;
-
-    graphics2D.setColor(color);
-    graphics2D.drawRoundRect(0, 0, w, h, arch + 2, arch + 2);
-    graphics2D.dispose();
-  }
-
   protected void paintBorderButton(Graphics graphics, JComponent b) {
+    // the button is disabled or the user don't want the borders
+    // enables on your hand
     if (!b.isEnabled() || !borderEnabled) {
       return;
     } else if (!buttonBorderToAll && ((JButton) b).getIcon() != null) {
+      // If the user don't want the border on all the buttons, we
+      // don't set the border on the button with an icon
       return;
     } else if (this.isDefaultButton() && !buttonBorderToAll) {
+      // if a button is a default button, and the user don't want
+      // the border on all the buttons we avoid set it on default buttons
       return;
     }
+    // otherwise, we set the border to the buttons
     Graphics2D graphics2D = (Graphics2D) graphics.create();
     graphics2D.setStroke(new BasicStroke(2f));