From db6489c34a5f24efa8b82c55c739aff000911c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 15 May 2024 11:45:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-111995=20=E3=80=90NewUI=E3=80=91?= =?UTF-8?q?=E6=96=87=E4=BB=B6-=E9=80=89=E9=A1=B9=E5=92=8C=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E9=9D=A2=E6=9D=BF=E7=BF=BB=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/file/PreferencePane.java | 3 +-- .../main/java/com/fr/design/actions/help/AboutDialog.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 505ece7fb8..e2b11c176c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -736,7 +736,6 @@ public class PreferencePane extends BasicPane { UILabel logLabel = new UILabel(i18nText("Fine-Design_Basic_Select_Export_Log_Directory") + ":"); logExportDirectoryField = new UITextField(24); UIButton chooseDirBtn = new UIButton("..."); - logExportPane.add(chooseDirBtn, BorderLayout.EAST); chooseDirBtn.setPreferredSize(new Dimension(25, 25)); chooseDirBtn.addActionListener(new ActionListener() { @Override @@ -1434,7 +1433,7 @@ public class PreferencePane extends BasicPane { */ private UIButton initGcButton() { UIButton gcButton = new UIButton(i18nText("Fine-Design_Vcs_Clean")); - gcButton.setPreferredSize(new Dimension(100, 15)); + gcButton.setPreferredSize(FineUIScale.scale(new Dimension(100, 15))); gcButton.setRoundBorder(true, Constants.LEFT); return gcButton; } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 30d288fc18..121d9ece9c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -39,7 +39,7 @@ public class AboutDialog extends JDialog implements ActionListener { this.setTitle(ProductConstants.PRODUCT_NAME); this.setResizable(false); - JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); + JPanel defaultPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); @@ -66,7 +66,7 @@ public class AboutDialog extends JDialog implements ActionListener { //esp. InputMap inputMapAncestor = defaultPane.getInputMap( - JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); ActionMap actionMap = defaultPane.getActionMap(); //transfer focus to CurrentEditor @@ -79,7 +79,7 @@ public class AboutDialog extends JDialog implements ActionListener { this.getRootPane().setDefaultButton(okButton); - this.setSize(defaultPane.getPreferredSize().width, 600); + this.setSize(FineUIScale.scale(new Dimension(defaultPane.getPreferredSize().width, 600))); GUICoreUtils.centerWindow(this); }