From 22886068f5e9c60eb9dfd5a9ab9751711498684d Mon Sep 17 00:00:00 2001
From: hzzz <hzzz0823@gmail.com>
Date: Fri, 15 Sep 2017 10:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E7=9B=B4=E6=8E=A5=E7=94=A8UIButton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/gui/ibutton/UIButtonUI.java |  8 +--
 .../fr/design/gui/icombobox/UIComboBoxUI.java | 51 ++++++++++++-------
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java b/designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java
index a38011208a..fb7605612c 100644
--- a/designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java
+++ b/designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java
@@ -40,11 +40,11 @@ public class UIButtonUI extends BasicButtonUI {
 
     protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) {
         if (isPressed(b) && b.isPressedPainted()) {
-            GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.COMBOBOX_BTN_PRESS);
+            GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles));
         } else if (isRollOver(b)) {
-            GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_ROLLOVER);
+            GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
         } else if (b.isNormalPainted()) {
-            GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_NORMAL);
+            GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted());
         }
     }
 
@@ -55,7 +55,7 @@ public class UIButtonUI extends BasicButtonUI {
 
     protected boolean isPressed(AbstractButton b) {
         ButtonModel model = b.getModel();
-        return model.isArmed() && model.isPressed();
+        return (model.isArmed() && model.isPressed()) || b.isSelected();
     }
 
     private void paintContent(Graphics g, AbstractButton b, String text) {
diff --git a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
index bed54db9dd..cebf2a07a7 100644
--- a/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
+++ b/designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java
@@ -1,29 +1,23 @@
 package com.fr.design.gui.icombobox;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.event.InputEvent;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-
-import javax.swing.*;
-import javax.swing.plaf.basic.BasicComboBoxUI;
-import javax.swing.plaf.basic.BasicComboPopup;
-import javax.swing.plaf.basic.ComboPopup;
-
 import com.fr.common.inputevent.InputEventBaseOnOS;
 import com.fr.design.constants.UIConstants;
-import sun.swing.DefaultLookup;
-
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ibutton.UIButtonUI;
 import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
+import sun.swing.DefaultLookup;
+
+import javax.swing.*;
+import javax.swing.plaf.ButtonUI;
+import javax.swing.plaf.basic.BasicComboBoxUI;
+import javax.swing.plaf.basic.BasicComboPopup;
+import javax.swing.plaf.basic.ComboPopup;
+import java.awt.*;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
@@ -46,6 +40,27 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
             public boolean shouldResponseChangeListener() {
                 return false;
             }
+
+            @Override
+            public ButtonUI getUI() {
+                return new UIButtonUI() {
+                    @Override
+                    protected boolean isPressed(AbstractButton b) {
+                        return model.isArmed() && model.isPressed();
+                    }
+
+                    @Override
+                    protected void doExtraPainting(UIButton b, Graphics2D g2d, int w, int h, String selectedRoles) {
+                        if (isPressed(b) && b.isPressedPainted()) {
+                            GUIPaintUtils.fillPressed(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), UIConstants.COMBOBOX_BTN_PRESS);
+                        } else if (isRollOver(b)) {
+                            GUIPaintUtils.fillRollOver(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_ROLLOVER);
+                        } else if (b.isNormalPainted()) {
+                            GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_NORMAL);
+                        }
+                    }
+                };
+            }
         };
         ((UIButton) arrowButton).setRoundBorder(true, Constants.LEFT);
         arrowButton.addMouseListener(this);