From 14cd58edd4e231165f88b245371514a3ee5195e2 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 6 Nov 2017 17:44:32 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-5284=20=E5=85=AC=E6=B5=8B=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E8=AE=BE=E8=AE=A1=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E8=89=B2=E5=92=8C=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=3D>=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/constants/UIConstants.java | 6 +++--- designer_base/src/com/fr/design/gui/imenu/UIMenu.java | 1 + designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java | 2 +- designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index aa27ea2ec..3df47f30a 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -74,7 +74,7 @@ public interface UIConstants { public static final Color SKY_BLUE = new Color(164, 192, 220); public static final Color OCEAN_BLUE = new Color(141, 179, 217); public static final Color DARK_BLUE = new Color(0, 88, 144); - public static final Color NORMAL_BACKGROUND = new Color(212, 212, 216); + public static final Color NORMAL_BACKGROUND = new Color(0xe0e0e3); public static final Color TREE_BACKGROUND = new Color(245, 245, 247); public static final Color TOOL_PANE_BACKGROUND = new Color(232, 232, 223); public static final Color SELECT_TAB = new Color(245, 245, 247); @@ -111,9 +111,9 @@ public interface UIConstants { public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9); public static final Color GRID_ROW_DETAILS_BACKGROUND = new Color(0xe8e8e9); public static final Color GRID_COLUMN_DETAILS_BACKGROUND = GRID_ROW_DETAILS_BACKGROUND; - public static final Color TEMPLATE_TAB_PANE_BACKGROUND = new Color(0xe0e0e3); + public static final Color TEMPLATE_TAB_PANE_BACKGROUND = NORMAL_BACKGROUND; public static final Color LOG_MESSAGE_BAR_BACKGROUND = TEMPLATE_TAB_PANE_BACKGROUND; - public static final Color UI_MENU_BACKGOURND = TEMPLATE_TAB_PANE_BACKGROUND; + public static final Color UI_MENU_BACKGOURND = LOG_MESSAGE_BAR_BACKGROUND; public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221); public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd); public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235); diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java index ecce5059c..9c905a83f 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java @@ -25,6 +25,7 @@ public class UIMenu extends JMenu { public JPopupMenu getPopupMenu() { JPopupMenu popupMenu = super.getPopupMenu(); + popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND); popupMenu.setBorder(new Border() { @Override diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java index 04d5d3b0b..3fe90dc98 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java @@ -24,7 +24,7 @@ public class UIMenuBarUI extends BasicMenuBarUI { return; } Color oldColor = g.getColor(); - g.setColor(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND); + g.setColor(UIConstants.UI_MENU_BACKGOURND); g.fillRect(0, 0, c.getWidth(), c.getHeight()); g.setColor(oldColor); } diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java index fdda1a612..9e79ecd65 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java @@ -19,7 +19,7 @@ public class UIMenuUI extends BasicMenuUI { int menuHeight = menuItem.getHeight(); if (menuItem.isOpaque()) { if (menuItem.getParent() instanceof JPopupMenu && model.isSelected()) { - g.setColor(UIConstants.NORMAL_BACKGROUND); + g.setColor(UIConstants.UI_MENU_BACKGOURND); g.fillRect(0, 0, menuWidth, menuHeight); GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7); } else if (model.isSelected()) { @@ -37,7 +37,7 @@ public class UIMenuUI extends BasicMenuUI { protected void paintPressed(Graphics g, int w, int h) { Graphics2D g2d = (Graphics2D) g; - g2d.setColor(UIConstants.NORMAL_BACKGROUND); + g2d.setColor(UIConstants.UI_MENU_BACKGOURND); g2d.fillRect(0, 0, w, h); g2d.setColor(UIConstants.LINE_COLOR); g2d.drawLine(0, 0, 0, h - 1);