From 1f12b37afe2299c23fbeadf71dbcbf7e05864f70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Tue, 3 Sep 2024 17:07:59 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-133167=20&=20REPORT-133157=20fix:?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E7=BC=A9=E6=94=BE=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/parameter/ParameterPropertyPane.java | 8 +++++--- .../java/com/fr/design/mainframe/bbs/UserInfoLabel.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java b/designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java index 16c0e91d65..75257c0b01 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java @@ -1,5 +1,6 @@ package com.fr.design.parameter; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.Parameter; import com.fr.design.border.FineBorderFactory; import com.fr.design.constants.UIConstants; @@ -23,6 +24,8 @@ import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import static com.fine.theme.utils.FineUIScale.scale; + public class ParameterPropertyPane extends JPanel{ private ParameterToolBarPane toolbarPane; private ParaDefinitePane paraPane; @@ -32,8 +35,7 @@ public class ParameterPropertyPane extends JPanel{ private static ParameterPropertyPane THIS; private boolean isEditing = false; - private static final int PADDING_MIDDLE = 10; - private static final int ADD_PARA_PANE_MAX_HEIGHT = 95; + private static final int ADD_PARA_PANE_MAX_HEIGHT = scale(120); public static final ParameterPropertyPane getInstance() { if (THIS == null) { @@ -138,7 +140,7 @@ public class ParameterPropertyPane extends JPanel{ private void setEditor(FormDesigner editor) { if (formHierarchyTreePaneWrapper == null) { formHierarchyTreePaneWrapper = new JPanel(new BorderLayout()); - formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, 0)); + formHierarchyTreePaneWrapper.setBorder(new ScaledEmptyBorder(0, 10, 0, 0)); this.add(formHierarchyTreePaneWrapper, BorderLayout.CENTER); } formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance()); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java index 1d1ff9ad48..c4fd87acef 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java @@ -49,6 +49,7 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import static com.fine.theme.utils.FineUIScale.scale; import static com.fine.theme.utils.FineUIStyle.BRAND_COLOR_LABEL; /** @@ -65,7 +66,7 @@ public class UserInfoLabel extends UILabel { private static final String MESSAGE_KEY = "messageCount"; private static final int MIN_MESSAGE_COUNT = 1; - private static final int MENU_HEIGHT = 20; + private static final int MENU_HEIGHT = scale(24); private static final int DEFAULT_BBS_UID = 0;