Pull request #13576: REPORT-113377 设计器视觉验收-左侧列表区

Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui

* commit '9b5efc29c846a9cc6ad3679dff39969a9ca46cd7':
  REPORT-113377 设计器视觉验收-左侧列表区
  REPORT-113377 设计器视觉验收-左侧列表区

designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java

@@ -330,12 +330,12 @@ public class FineLightIconSet extends AbstractIconSet {
                 new SvgIconSource("number_field", "com/fine/theme/icon/widget/number_field.svg", true),
                 new SvgIconSource("password_field", "com/fine/theme/icon/widget/password_field.svg", true),
                 new SvgIconSource("picture", "com/fine/theme/icon/widget/picture.svg", true),
-                new SvgIconSource("preview", "com/fine/theme/icon/widget/preview.svg", true),
+                new SvgIconSource("widget_preview", "com/fine/theme/icon/widget/preview.svg", true),
                 new SvgIconSource("prewidget", "com/fine/theme/icon/widget/prewidget.svg", true),
                 new SvgIconSource("tab", "com/fine/theme/icon/widget/tab.svg", true),
                 new SvgIconSource("text_area", "com/fine/theme/icon/widget/text_area.svg", true),
                 new SvgIconSource("text_field", "com/fine/theme/icon/widget/text_field.svg", true),
-                new SvgIconSource("tree", "com/fine/theme/icon/widget/tree.svg", true)
+                new SvgIconSource("widget_tree", "com/fine/theme/icon/widget/tree.svg", true)
 
         );
     }

designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java

@@ -122,19 +122,24 @@ public class FineToggleButtonUI extends FlatToggleButtonUI {
         int height = c.getHeight();
         int width = c.getWidth();
         boolean selected = ((AbstractButton) c).isSelected();
-        Color enabledColor = selected ? clientPropertyColor(c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground) : null;
 
-        // use component background if explicitly set
+        // paint background
-        if (enabledColor == null) {
+        Color background;
-            Color bg = c.getBackground();
+        if(c.isEnabled() && selected) {
-            if (isCustomBackground(bg)) {
+            background = tabSelectedBackground;
-                enabledColor = bg;
+        } else {
+            Color enabledColor = selected ? clientPropertyColor(c, TAB_BUTTON_SELECTED_BACKGROUND, tabSelectedBackground) : null;
+            // use component background if explicitly set
+            if (enabledColor == null) {
+                Color bg = c.getBackground();
+                if (isCustomBackground(bg)) {
+                    enabledColor = bg;
+                }
             }
+            background = buttonStateColor(c, enabledColor,
+                    null, tabFocusBackground, tabHoverBackground, null);
         }
 
-        // paint background
-        Color background = buttonStateColor(c, enabledColor,
-                null, tabFocusBackground, tabHoverBackground, null);
         if (background != null) {
             g.setColor(background);
             g.fillRoundRect(0, 0, width, height, tabArc, tabArc);

designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@@ -156,7 +156,7 @@ public abstract class WidgetOption implements Serializable {
 
     public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(
             i18nText("Fine-Design_Report_View_Tree"),
-            "tree",
+            "widget_tree",
             TreeEditor.class);
 
     public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(

designer-base/src/main/resources/com/fine/theme/icon/search.svg

@@ -1,7 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.0737 22.518C27.9799 17.8266 27.7324 10.8448 23.3313 6.44368C18.6679 1.78033 11.1072 1.78033 6.4438 6.44368C1.78045 11.107 1.78045 18.6678 6.4438 23.3312C10.8449 27.7323 17.8267 27.9798 22.5181 24.0736L27.4445 29.0001C27.8741 29.4296 28.5705 29.4296 29.0001 29.0001C29.4297 28.5705 29.4297 27.874 29.0001 27.4444L24.0737 22.518ZM21.7757 7.99932C25.5798 11.8035 25.5798 17.9713 21.7756 21.7755C17.9715 25.5797 11.8036 25.5797 7.99944 21.7755C4.19524 17.9713 4.19524 11.8035 7.99944 7.99931C11.8036 4.19512 17.9715 4.19512 21.7757 7.99932Z" fill="#0A1C38" fill-opacity="0.9"/>
-    <title>icon_搜索_normal</title>
-    <g id="icon_搜索_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M6.5,1 C9.53756612,1 12,3.46243388 12,6.5 C12,7.75769341 11.577854,8.91678934 10.8675261,9.84332369 L14.7880061,13.764409 C15.0706646,14.0470675 15.0706646,14.5053476 14.7880061,14.7880061 C14.5053476,15.0706646 14.0470675,15.0706646 13.764409,14.7880061 L9.84332369,10.8675261 C8.91678934,11.577854 7.75769341,12 6.5,12 C3.46243388,12 1,9.53756612 1,6.5 C1,3.46243388 3.46243388,1 6.5,1 Z M6.5,2 C4.01471863,2 2,4.01471863 2,6.5 C2,8.98528137 4.01471863,11 6.5,11 C8.98528137,11 11,8.98528137 11,6.5 C11,4.01471863 8.98528137,2 6.5,2 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
-    </g>
 </svg>

designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.0737 22.518C27.9799 17.8266 27.7324 10.8448 23.3313 6.44368C18.6679 1.78033 11.1072 1.78033 6.4438 6.44368C1.78045 11.107 1.78045 18.6678 6.4438 23.3312C10.8449 27.7323 17.8267 27.9798 22.5181 24.0736L27.4445 29.0001C27.8741 29.4296 28.5705 29.4296 29.0001 29.0001C29.4297 28.5705 29.4297 27.874 29.0001 27.4444L24.0737 22.518ZM21.7757 7.99932C25.5798 11.8035 25.5798 17.9713 21.7756 21.7755C17.9715 25.5797 11.8036 25.5797 7.99944 21.7755C4.19524 17.9713 4.19524 11.8035 7.99944 7.99931C11.8036 4.19512 17.9715 4.19512 21.7757 7.99932Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -131,7 +131,7 @@ color.brand4=#84B1F6
 background.normal=#FFFFFF
 text.white=#ffffff
 text.placeholder=fade(@foreground, 40%)
-text.highlight=fade(@foreground, 90%)
+text.highlight=#F9AE31
 fill.hover=#E6E9EF
 fill.click=#DADEE7
 fill.normal=#FFFFFF
@@ -1102,8 +1102,8 @@ ToolTip.maxWidth=392
 Tree.border = 1,1,1,1
 Tree.editorBorder = 1,1,1,1,@cellFocusColor
 Tree.background = @componentBackground
-Tree.selectionInactiveBackground = @selectionInactiveBackground
+Tree.selectionInactiveBackground = @selectionBackground
-Tree.selectionInactiveForeground = @selectionInactiveForeground
+Tree.selectionInactiveForeground = @selectionForeground
 Tree.textBackground = $Tree.background
 Tree.textForeground = $Tree.foreground
 Tree.selectionBorderColor = @cellFocusColor
@@ -1142,7 +1142,6 @@ West.border = $defaultBorderColor
 #---- ExpandablePane ----
 ExpandablePane.HeaderPane.borderInsets=0, 6, 0, 6
 ExpandablePane.HeaderPane.hGap=0
-ExpandablePane.HeaderPane.foreground=$text.highlight
 ExpandablePane.vGap=5
 HeaderPane.width=248
 HeaderPane.height=$Component.defaultHeight