Merge pull request #1238 in BA/design from ~HZZZ/design:release/9.0 to release/9.0

* commit '7fa32549645e7ceccf43e81b99425d5ac7e8eab9':
  下拉框按钮非点击状态颜色 & 下拉框选项背景色
  下拉框按钮的颜色
  ToolbarUI背景色
  条件属性背景

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -64,6 +64,9 @@ public interface UIConstants {
             Constants.LINE_MEDIUM_DASH_DOT_DOT, //medium dash-dot-dot border
             Constants.LINE_SLANTED_DASH_DOT, //slanted dash-dot border
     };
+    public static final Color COMBOBOX_BTN_NORMAL = new Color(0xD9DADD);
+    public static final Color COMBOBOX_BTN_ROLLOVER = new Color(0xC8C9CD);
+    public static final Color COMBOBOX_BTN_PRESS = new Color(0xD8F2FD);
     public static final Color LINE_COLOR = new Color(153, 153, 153);
     public static final Color FONT_COLOR = new Color(51, 51, 51);
     public static final Color LIGHT_BLUE = new Color(182, 217, 253);

designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -6,6 +6,7 @@ import com.fr.base.chart.BasePlot;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane;
@@ -87,6 +88,7 @@ public abstract class UIListControlPane extends UIControlPane {
     protected void initLeftPane(JPanel leftPane) {
         nameableList = createJNameList();
         nameableList.setName(LIST_NAME);
+        nameableList.setSelectionBackground(UIConstants.ATTRIBUTE_PRESS);
         leftPane.add(new UIScrollPane(nameableList), BorderLayout.CENTER);
 
 

designer_base/src/com/fr/design/gui/ibutton/UIButtonUI.java

@@ -1,27 +1,16 @@
 package com.fr.design.gui.ibutton;
 
-import java.awt.FontMetrics;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Insets;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-
-import javax.swing.AbstractButton;
-import javax.swing.ButtonModel;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.plaf.basic.BasicButtonUI;
-import javax.swing.plaf.basic.BasicHTML;
-import javax.swing.text.View;
-
 import com.fr.design.constants.UIConstants;
 import com.fr.design.roleAuthority.ReportAndFSManagePane;
+import com.fr.design.utils.gui.GUIPaintUtils;
+import com.fr.stable.StringUtils;
 import sun.swing.SwingUtilities2;
 
-import com.fr.stable.StringUtils;
+import javax.swing.*;
-import com.fr.design.utils.gui.GUIPaintUtils;
+import javax.swing.plaf.basic.BasicButtonUI;
+import javax.swing.plaf.basic.BasicHTML;
+import javax.swing.text.View;
+import java.awt.*;
 
 public class UIButtonUI extends BasicButtonUI {
 
@@ -51,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));
+            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());
+            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());
+            GUIPaintUtils.fillNormal(g2d, 0, 0, w, h, b.isRoundBorder(), b.getRectDirection(), b.isDoneAuthorityEdited(selectedRoles), b.isPressedPainted(), UIConstants.COMBOBOX_BTN_NORMAL);
         }
     }
 
@@ -66,7 +55,7 @@ public class UIButtonUI extends BasicButtonUI {
 
     protected boolean isPressed(AbstractButton b) {
         ButtonModel model = b.getModel();
-        return (model.isArmed() && model.isPressed()) || b.isSelected();
+        return model.isArmed() && model.isPressed();
     }
 
     private void paintContent(Graphics g, AbstractButton b, String text) {

designer_base/src/com/fr/design/gui/icombobox/UIComboBoxRenderer.java

@@ -27,7 +27,7 @@ public class UIComboBoxRenderer extends DefaultListCellRenderer {
 		cellHasFocus = cellHasFocus && !this.isEnabled();
 		JLabel renderer =(JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
 		renderer.setForeground(Color.black);
-		list.setSelectionBackground(UIConstants.FLESH_BLUE);
+		list.setSelectionBackground(UIConstants.COMBOBOX_BTN_PRESS);
 		list.setSelectionForeground(Color.black);
 		renderer.setText(" " + renderer.getText());
 		return renderer;

designer_base/src/com/fr/design/gui/itoolbar/UIToolBarUI.java

@@ -25,6 +25,8 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIToolButtonBorder;
 import com.fr.design.gui.icheckbox.UICheckBox;
 
+import static com.fr.design.utils.ThemeUtils.BACK_COLOR;
+
 public class UIToolBarUI extends MetalToolBarUI {
     public static final String IS_TOOL_BAR_BUTTON_KEY = "JToolBar.isToolbarButton";
     public static final int FLOATABLE_GRIP_SIZE = 8;
@@ -89,7 +91,7 @@ public class UIToolBarUI extends MetalToolBarUI {
      */
     public void paint(Graphics g, JComponent c) {
         Graphics2D g2 = (Graphics2D) g;
-        g2.setColor(UIConstants.TOOLBARUI_BACKGROUND);
+        g2.setColor(BACK_COLOR);
         g2.fillRect(0, 0, c.getWidth(), c.getHeight());
     }
 

designer_base/src/com/fr/design/utils/gui/GUIPaintUtils.java

@@ -49,6 +49,7 @@ public class GUIPaintUtils {
 
     /**
      * 正常状态填充
+     *
      * @param g2d               图形对象
      * @param x                 x坐标
      * @param y                 y坐标
@@ -60,12 +61,16 @@ public class GUIPaintUtils {
      * @param isPressedPainted  是否按压画
      */
     public static final void fillNormal(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted) {
+        fillNormal(g2d, x, y, width, height, isRound, rectDirection, isAuthorityEdited, isPressedPainted, UIConstants.ATTRIBUTE_NORMAL);
+    }
+
+    public static final void fillNormal(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited, boolean isPressedPainted, Color color) {
         GradientPaint gp;
         if (BaseUtils.isAuthorityEditing() && isAuthorityEdited) {
             gp = new GradientPaint(1, 1, UIConstants.AUTHORITY_BLUE, 1, height - 1, UIConstants.AUTHORITY_DARK_BLUE);
         } else if (isPressedPainted) {
-            gp = new GradientPaint(1, 1, UIConstants.ATTRIBUTE_NORMAL, 1, height - 1, UIConstants.ATTRIBUTE_NORMAL);
+            gp = new GradientPaint(1, 1, color, 1, height - 1, color);
-        }else{
+        } else {
             gp = new GradientPaint(1, 1, UIConstants.SHADOW_GREY, 1, height - 1, UIConstants.SHADOW_GREY);
         }
 
@@ -74,6 +79,7 @@ public class GUIPaintUtils {
 
     /**
      * 鼠标悬停状态填充
+     *
      * @param g2d               图形对象
      * @param x                 x坐标
      * @param y                 y坐标
@@ -104,6 +110,7 @@ public class GUIPaintUtils {
 
     /**
      * 按压状态填充
+     *
      * @param g2d               图形对象
      * @param x                 x坐标
      * @param y                 y坐标
@@ -112,7 +119,6 @@ public class GUIPaintUtils {
      * @param isRound           是否圆角
      * @param rectDirection     矩形方向
      * @param isAuthorityEdited 是否权限编辑
-     *
      */
     public static final void fillPressed(Graphics2D g2d, int x, int y, int width, int height, boolean isRound, int rectDirection, boolean isAuthorityEdited) {
         fillPressed(g2d, x, y, width, height, isRound, rectDirection, isAuthorityEdited, null);
@@ -147,8 +153,10 @@ public class GUIPaintUtils {
 
         g2d.setColor(oldColor);
     }
+
     /**
      * 自定义画笔填充
+     *
      * @param g2d           图形对象
      * @param x             x坐标
      * @param y             y坐标