From b9ff15c392a07b0c694b2fe5cc2940f19eeb2a30 Mon Sep 17 00:00:00 2001 From: renekton Date: Tue, 6 Aug 2024 17:02:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7/?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5/=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fine/theme/light/ui/laf/FineLightLaf.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 f3f36698da..2bf4407d29 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 @@ -1336,4 +1336,6 @@ CellOtherSetPane.height=$Component.defaultHeight [style]Button.envDetectorButton = \ foreground: #FFF; \ - background: #2576EF \ No newline at end of file + background: #2576EF; \ + hoverBackground: #2576EF; \ + pressedBackground: null From 06c28436c84c76d234b33c4d06b641e167d04e9a Mon Sep 17 00:00:00 2001 From: renekton Date: Tue, 6 Aug 2024 17:21:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A1=AB=E6=8A=A5=E5=B1=9E=E6=80=A7/?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5/=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fine/theme/utils/FineUIStyle.java | 2 -- .../main/java/com/fr/env/detect/ui/EnvDetectorDialog.java | 2 +- .../com/fine/theme/light/ui/laf/FineLightLaf.properties | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java index 1aa828c578..5e15fffb0b 100644 --- a/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java +++ b/designer-base/src/main/java/com/fine/theme/utils/FineUIStyle.java @@ -42,8 +42,6 @@ public interface FineUIStyle { String PURE_TREE = "pureTree"; String PASTEL_BUTTON = "pastelButton"; - String ENV_DECTETOR_BUTTON = "envDetectorButton"; - /** * 添加组件的样式类，类似css，该方法会接在原样式后方 diff --git a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java index c8d4df5a54..c504d80b33 100644 --- a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java +++ b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java @@ -147,7 +147,7 @@ public class EnvDetectorDialog extends JDialog { JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0)); this.detectButton = new UIButton(buttonStatus.getDesc()); - FineUIStyle.setStyle(detectButton, FineUIStyle.ENV_DECTETOR_BUTTON); + FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY); detectButton.setToolTipText(buttonStatus.getDesc()); detectButton.addActionListener(event -> { if (buttonStatus.isNotExecuting()) { 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 2bf4407d29..5310524e57 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 @@ -1333,9 +1333,3 @@ CellOtherSetPane.height=$Component.defaultHeight [style]Tree.pureTree = \ background: $fill.normal - -[style]Button.envDetectorButton = \ - foreground: #FFF; \ - background: #2576EF; \ - hoverBackground: #2576EF; \ - pressedBackground: null