From d1fd96ae3332b0b7d164f559d376a895551d2f74 Mon Sep 17 00:00:00 2001 From: renekton Date: Thu, 10 Oct 2024 11:16:54 +0800 Subject: [PATCH] =?UTF-8?q?js=E9=AB=98=E7=BA=A7=E7=BC=96=E8=BE=91=E7=BC=A9?= =?UTF-8?q?=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/javascript/JSContentWithDescriptionPane.java | 2 +- .../main/java/com/fr/design/javascript/JavaScriptImplPane.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java b/designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java index cdd7601c35..42a0fc584d 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JSContentWithDescriptionPane.java @@ -762,7 +762,7 @@ public class JSContentWithDescriptionPane extends JSContentPane implements KeyLi private JPanel createTipsPane() { JPanel tipsPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); tipsPane.setLayout(new BorderLayout(4, 4)); - tipsPane.setBorder(BorderFactory.createEmptyBorder(30, 2, 0, 0)); + tipsPane.setBorder(new ScaledEmptyBorder(30, 2, 0, 0)); JPanel searchPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); searchPane.setLayout(new BorderLayout(4, 4)); keyWordTextField.setPlaceholder(Toolkit.i18nText("Fine-Design_Search_Interface")); diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index bb1921689b..0baac74f0b 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -30,6 +30,7 @@ import java.util.List; import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.cell; +import static com.fine.theme.utils.FineUIScale.scale; public class JavaScriptImplPane extends AbstractHyperLinkPane { private static final int BOTTOM_BORDER = 12; @@ -73,7 +74,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { cell(FineUIUtils.wrapComponentWithTitle(importedJsPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))).weight(0.5), cell(FineUIUtils.wrapComponentWithTitle(parameterPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"))).weight(0.5) ).getComponent()); - topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, 150)); + topPane.setPreferredSize(new Dimension(super.getPreferredSize().width, scale(150))); this.setLayout(new BorderLayout()); this.add(topPane, BorderLayout.NORTH);