From 431f429dbbc449070af0084b558b3d6d5a295869 Mon Sep 17 00:00:00 2001 From: lemon Date: Thu, 17 Oct 2024 10:21:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0=20jira=20fix:=20=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=8A=A5=E8=A1=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/gui/itree/filetree/ReportletPane.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java index dbc7c54464..041f4db0c5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java @@ -15,7 +15,6 @@ import java.awt.CardLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import static com.fine.swing.ui.layout.Layouts.column; import static com.fine.swing.ui.layout.Layouts.row; import static com.fine.swing.ui.layout.Layouts.cell; @@ -37,7 +36,7 @@ public class ReportletPane extends BasicPane { UILabel tipLabel = new UILabel(); tipLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Schedule_The_Selected_File_Must_Be_End_With_Filter")); tipLabel.setForeground(FineUIUtils.getUIColor("Label.tipColor", "Label.tipColor")); - JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + JPanel centerPane = new JPanel(FRGUIPaneFactory.createScaledBorderLayout(0, 6)); this.add(centerPane, BorderLayout.CENTER); switchButton = new UIButton("switch"); @@ -53,13 +52,14 @@ public class ReportletPane extends BasicPane { cardPane.setLayout(card = new CardLayout()); templateReportletTree = new TemplateFileTree(); templateReportletTree.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal")); - templateReportletTree.setBorder(FineBorderFactory.createWrappedRoundBorder()); IOFileNodeFilter filter = new IOFileNodeFilter(new String[]{".cpt", ".class", ".frm", ".form", ".cptx"}); templateReportletTree.setFileNodeFilter(filter); cardPane.add(t_panel = new JScrollPane(templateReportletTree), "TEMPLATE"); classReportletTree = new ClassFileTree(); cardPane.add(c_panel = new JScrollPane(classReportletTree), "CLASS"); - centerPane.add(column(6, cell(buttonPane), cell(cardPane)).getComponent()); + cardPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); + centerPane.add(buttonPane, BorderLayout.NORTH); + centerPane.add(cardPane, BorderLayout.CENTER); this.refreshEnv(); } From e466a761b63d2743f99f9a8c52e91df6e499a375 Mon Sep 17 00:00:00 2001 From: lemon Date: Thu, 17 Oct 2024 14:26:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-137556=20&=20REPORT-137644=20fix=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=9D=97=E5=B8=83=E5=B1=80=20&=20=E8=83=8C=E6=99=AF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/accessibles/AccessibleBackgroundEditor.java | 3 ++- .../java/com/fr/design/style/background/BackgroundPane.java | 1 + .../java/com/fr/design/style/color/NewColorSelectPane.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java index 8c0137c6f4..939b87d4df 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleBackgroundEditor.java @@ -7,6 +7,7 @@ import java.awt.*; import javax.swing.*; +import com.fine.theme.utils.FineUIScale; import com.fr.general.Background; import com.fr.design.mainframe.widget.wrappers.BackgroundWrapper; import com.fr.design.dialog.BasicDialog; @@ -29,7 +30,7 @@ public class AccessibleBackgroundEditor extends UneditableAccessibleEditor { protected void showEditorPane() { if (backgroundPane == null) { backgroundPane = new BackgroundPane(); - backgroundPane.setPreferredSize(new Dimension(600, 400)); + backgroundPane.setPreferredSize(FineUIScale.createScaleDimension(600, 400)); } BasicDialog dlg = backgroundPane.showWindow(SwingUtilities.getWindowAncestor(this)); dlg.addDialogActionListener(new DialogActionAdapter() { diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java index 786c472c08..2187c99ece 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java @@ -92,6 +92,7 @@ public class BackgroundPane extends BasicPane { quickPane = BackgroundFactory.createIfAbsent(background == null ? null : background.getClass()); cacheMap.put(index, quickPane); } + tabbedPane.setSelectedIndex(index); return quickPane; } diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 1e7b3394e4..e8728d1672 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -267,7 +267,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { private void initMenuColorPane() { - menuColorPane.setLayout(new GridLayout(5, 8, DEFAULT_COLOR_HOR_INTERVAL, 0)); + menuColorPane.setLayout(new GridLayout(4, 10, DEFAULT_COLOR_HOR_INTERVAL, 0)); Color[] colorArray = this.getColorArray(); for (int i = 0; i < colorArray.length; i++) { Color color = colorArray[i] == null ? UsedColorPane.DEFAULT_COLOR : colorArray[i];