From 0d5905b326d1271b626ea5b83d37049fac46b940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Fri, 23 Feb 2024 15:26:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-113377=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6-=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fine/theme/light/ui/FineLightIconSet.java | 4 ++-- .../theme/light/ui/FineToggleButtonUI.java | 23 +++++++++++-------- .../resources/com/fine/theme/icon/search.svg | 8 ++----- .../com/fine/theme/icon/search_disable.svg | 3 +++ .../light/ui/laf/FineLightLaf.properties | 7 +++--- 5 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java index 77079e8fdc..7fa3a7d058 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java +++ b/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) ); } diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java index aab2766a03..ad28f76f8c 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineToggleButtonUI.java +++ b/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 - if (enabledColor == null) { - Color bg = c.getBackground(); - if (isCustomBackground(bg)) { - enabledColor = bg; + // paint background + Color background; + if(c.isEnabled() && selected) { + background = tabSelectedBackground; + } 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); diff --git a/designer-base/src/main/resources/com/fine/theme/icon/search.svg b/designer-base/src/main/resources/com/fine/theme/icon/search.svg index 0e0ebbbd44..b04adf27f1 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/search.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/search.svg @@ -1,7 +1,3 @@ - - - icon_搜索_normal - - - + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg new file mode 100644 index 0000000000..982bbe7687 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/search_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index d7669df0f3..51042cb0b2 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties +++ b/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.selectionInactiveForeground = @selectionInactiveForeground +Tree.selectionInactiveBackground = @selectionBackground +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 From 9b5efc29c846a9cc6ad3679dff39969a9ca46cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Fri, 23 Feb 2024 16:28:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-113377=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6-=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/gui/core/WidgetOption.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index 6dd9826fb7..5c6babf640 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/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(