From 92156ccebc9fa5a2dfb77464e1592c585a9edd50 Mon Sep 17 00:00:00 2001 From: lemon Date: Thu, 8 Aug 2024 10:23:19 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-127437=20fix:=E7=BA=B8=E5=BC=A0=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/gui/style/FollowingThemePane.java | 3 ++- .../java/com/fr/design/report/NewReportBackgroundPane.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java index e464110b47..d4b7db8281 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java @@ -17,10 +17,10 @@ import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.JTemplate; import com.fr.design.widget.FRWidgetFactory; -import javax.swing.BorderFactory; import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Component; +import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -78,6 +78,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver { TableLayoutHelper.createGapTableLayoutPane( new Component[][]{new Component[] { followingThemeLabel, FRGUIPaneFactory.createBorderLayoutNorthPaneWithComponent(followingThemeButtonGroup)}}, new double[] { p }, new double[] {FineUIScale.scale(SETTING_LABEL_WIDTH), f }, 10, 0); followingThemePane.setVisible(false); + followingThemePane.setPreferredSize(new Dimension(FineUIScale.scale(275), (int) followingThemePane.getPreferredSize().getHeight())); add(followingThemePane, BorderLayout.NORTH); container = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java b/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java index 3f6a6d71bd..0aadbb2d63 100644 --- a/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java @@ -121,7 +121,7 @@ public class NewReportBackgroundPane extends BasicPane { uiLabelPane.add(uiLabel, BorderLayout.NORTH); uiLabelPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); backgroundPane = new ReportBackgroundSpecialPane(); - backgroundPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 10)); + backgroundPane.setBorder(new ScaledEmptyBorder(10, 0, 0, 0)); backgroundLabeledPane = TableLayoutHelper.createCommonTableLayoutPane( new Component[][]{ new Component[] { uiLabelPane, backgroundPane } }, new double[] { p }, new double[] { FineUIScale.scale(SETTING_LABEL_WIDTH), f}, IntervalConstants.INTERVAL_L1