From 80c0e44cdc5cfa950c1f17e21f1ae521d7085ced Mon Sep 17 00:00:00 2001 From: lemon Date: Sun, 22 Sep 2024 14:37:03 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-134742=20fix:=20=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/gui/date/CalendarNumberField.java | 3 ++- .../src/main/java/com/fr/design/gui/date/UICalendarPanel.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java index c4a6c24c7a..454f3c525e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java @@ -12,6 +12,7 @@ import java.awt.Toolkit; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import static com.fine.theme.utils.FineUIScale.createScaleDimension; import static com.fine.theme.utils.FineUIScale.scale; /** @@ -99,7 +100,7 @@ public class CalendarNumberField extends UINumberField { } public Dimension getPreferredSize() { - return scale(new Dimension(24, 24)); + return createScaleDimension(24, 24); } public boolean shouldResponseChangeListener() { diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index d8a6a627fd..27ae3f528f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -235,7 +235,7 @@ public class UICalendarPanel extends JPanel { } }); - sPane.add(row(12, cell(timeLabel), cell(hms), flex(), cell(okButton)).getComponent()); + sPane.add(row(cell(timeLabel).weight(36), cell(hms).weight(180), flex(), cell(okButton).weight(48)).getComponent()); sPane.setBorder(new ScaledEmptyBorder(10, 12, 10, 12)); return sPane; }