From 6dc7f3f43a5a4a10f0b9ff91d45511241cdd1b89 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 31 May 2016 20:21:51 +0200
Subject: [PATCH] cleanup

---
 .../intellij/WinIntelliJButtonPainter.java    | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonPainter.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonPainter.java
index 43592a33e577..72cf7a73989a 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonPainter.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonPainter.java
@@ -35,15 +35,9 @@ public class WinIntelliJButtonPainter implements Border, UIResource {
     @Override
     public void paintBorder(Component c, Graphics graphics, int x, int y, int width, int height) {
       Graphics2D g = (Graphics2D)graphics;
-      final Insets ins = getBorderInsets(c);
-      final int yOff = (ins.top + ins.bottom) / 4;
-      final boolean square = DarculaButtonUI.isSquare(c);
-      int offset = JBUI.scale(square ? 1 : getOffset());
-      int w = c.getWidth();
-      int h = c.getHeight();
-      int diam = JBUI.scale(22);
-
-      if (c.hasFocus() || DarculaButtonUI.isDefaultButton((JComponent)c)) {
+      final boolean hasFocus = c.hasFocus();
+      final boolean isDefault = DarculaButtonUI.isDefaultButton((JComponent)c);
+      if (hasFocus || isDefault) {
         if (DarculaButtonUI.isHelpButton((JComponent)c)) {
             //todo
         } else {
@@ -52,7 +46,7 @@ public class WinIntelliJButtonPainter implements Border, UIResource {
           g.translate(x,y);
           g.drawRect(JBUI.scale(1), JBUI.scale(1), width-2*JBUI.scale(1), height-2*JBUI.scale(1));
 
-          if (c.hasFocus()) {
+          if (hasFocus) {
             g.setStroke(new BasicStroke(JBUI.scale(1f)));
             g.setColor(Gray.x00);
             UIUtil.drawDottedRectangle(g, JBUI.scale(1) + 1, JBUI.scale(1) + 1, width-2*JBUI.scale(1) - 1, height-2*JBUI.scale(1) - 1);
@@ -72,12 +66,12 @@ public class WinIntelliJButtonPainter implements Border, UIResource {
     @Override
     public Insets getBorderInsets(Component c) {
       if (c.getParent() instanceof ActionToolbar) {
-        return JBUI.insets(4, 16, 4, 16);
+        return JBUI.insets(4, 16).asUIResource();
       }
       if (DarculaButtonUI.isSquare(c)) {
-        return JBUI.insets(2, 0, 2, 0).asUIResource();
+        return JBUI.insets(2, 0).asUIResource();
       }
-      return JBUI.insets(3, 17, 3, 15).asUIResource();
+      return JBUI.insets(3, 17).asUIResource();
     }
 
     protected int getOffset() {