From b6f95786ad559f28d96160388b01bd3d658f91b1 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 1 Aug 2017 09:51:20 +0800 Subject: [PATCH] 3 background --- designer_base/src/com/fr/design/constants/UIConstants.java | 3 +-- .../src/com/fr/design/gui/imenu/UIMenuHighLight.java | 2 +- .../src/com/fr/design/mainframe/loghandler/LogMessageBar.java | 4 +++- .../src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index 7d346db4c..69be5c607 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -67,7 +67,7 @@ public interface UIConstants { public static final Color SHADOW_GREY = new Color(0xe2e2e2); public static final Color SHADOW_CENTER = new Color(200, 200, 200); public static final Color SHADOW_PURPLE = new Color(255, 0, 255); - public static final Color FLESH_BLUE = new Color(168, 180, 202); + public static final Color FLESH_BLUE = new Color(70, 157, 246); public static final Color HOVER_BLUE = new Color(0xd2d2d2); public static final Color DOTTED_LINE_COLOR = new Color(35, 108, 184); public static final Color AUTHORITY_COLOR = new Color(88, 125, 153); @@ -91,7 +91,6 @@ public interface UIConstants { public static final Color RULER_SCALE_COLOR = new Color(0x4e504f); - public static final BufferedImage DRAG_BAR = BaseUtils.readImage("com/fr/design/images/control/bar.png"); public static final BufferedImage DRAG_BAR_RIGHT = BaseUtils.readImage("com/fr/design/images/control/barm.png"); public static final BufferedImage DRAG_BAR_LEFT = BaseUtils.readImage("com/fr/design/images/control/barl.png"); diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuHighLight.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuHighLight.java index ac29a729d..05c46403d 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuHighLight.java +++ b/designer_base/src/com/fr/design/gui/imenu/UIMenuHighLight.java @@ -13,7 +13,7 @@ public class UIMenuHighLight extends JPanel{ @Override public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); - dim.height = 2; + dim.height = 0; return dim; } public void paint(Graphics g) { diff --git a/designer_base/src/com/fr/design/mainframe/loghandler/LogMessageBar.java b/designer_base/src/com/fr/design/mainframe/loghandler/LogMessageBar.java index a0e9d753a..defbb1322 100644 --- a/designer_base/src/com/fr/design/mainframe/loghandler/LogMessageBar.java +++ b/designer_base/src/com/fr/design/mainframe/loghandler/LogMessageBar.java @@ -11,6 +11,8 @@ import com.fr.general.Inter; import javax.swing.JPanel; +import static com.fr.design.constants.UIConstants.NORMAL_BACKGROUND; + public class LogMessageBar extends JPanel { private UILabel messageLabel; private int width = 600; @@ -34,7 +36,7 @@ public class LogMessageBar extends JPanel { messageLabel = new UILabel(); setLayout(new BorderLayout()); add(messageLabel, BorderLayout.CENTER); - + setBackground(NORMAL_BACKGROUND); addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 4bc3658b4..732a48360 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -87,7 +87,6 @@ public abstract class ToolBarMenuDock { } } - refreshLargeToolbarState(); }