Merge pull request #1414 in BA/design from ~PLOUGH/design:release/9.0 to release/9.0

* commit '4dc9de8c94cc94485b4e84db3d5c4edf7a5d594a':
  REPORT-5284 公测客户反馈设计器配色和交互问题修改=>顶部菜单颜色调整
  REPORT-5284 公测客户反馈设计器配色和交互问题修改=>修改tab跳转六项功能的图标

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);

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

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);
     }

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);