From 8a38d857e30ee7f2a5aecfcabd2ea845e59b4975 Mon Sep 17 00:00:00 2001
From: momeak <fr123456>
Date: Fri, 15 Sep 2017 16:42:52 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4604=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BF=AE=E6=94=B9=20=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0=E4=B8=8B=E6=8B=89=E6=A1=86=E5=92=8C=E8=B6=85?=
 =?UTF-8?q?=E7=BA=A7=E9=93=BE=E6=8E=A5=E4=B8=8B=E6=8B=89=E6=A1=86=E8=A7=86?=
 =?UTF-8?q?=E8=A7=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java
index e27446bec..0df132caf 100644
--- a/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java
+++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuEastAttrItem.java
@@ -62,7 +62,7 @@ public class UIMenuEastAttrItem extends JMenuItem {
 
             if (menuItem.isOpaque()) {
                 if (model.isArmed() || (menuItem instanceof JMenu && model.isSelected())) {
-                    GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.POPUP_TITLE_BACKGROUND, 0);
+                    GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 0);
                 } else {
                     GUIPaintUtils.fillPaint((Graphics2D) g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.TOOLBARUI_BACKGROUND, 0);
                 }
@@ -70,7 +70,7 @@ public class UIMenuEastAttrItem extends JMenuItem {
             }
             else if (model.isArmed() || (menuItem instanceof JMenu &&
                     model.isSelected())) {
-                GUIPaintUtils.fillPaint((Graphics2D)g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.POPUP_TITLE_BACKGROUND, 7);
+                GUIPaintUtils.fillPaint((Graphics2D)g, 0, 0, menuWidth, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
                 g.setColor(oldColor);
             }
         }
@@ -95,6 +95,7 @@ public class UIMenuEastAttrItem extends JMenuItem {
                                     fm.getAscent() - 1);
                 }
             } else {
+                menuItem.setForeground(isArmed() ? Color.white : Color.black);
                 SwingUtilities2.drawStringUnderlineCharAt(menuItem, g, text,
                         -1, 0, textRect.y + fm.getAscent());
             }