From d8a94fce011d1212fb3fceacade9dcb840aebf91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Tue, 22 Oct 2024 13:53:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-137786=20fix:=20=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E7=BC=A9=E6=94=BE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java index b410afc207..90bec71856 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineComboBoxUI.java @@ -88,7 +88,7 @@ public class FineComboBoxUI extends FlatComboBoxUI { // 限制最大宽度，如超出则高度预留展示横向滚动条所需宽度 int comboWidth = comboBox.getWidth(); if (fitRectangle.width > comboWidth) { - return new Rectangle(px, py, comboWidth, fitRectangle.height + FlatUIUtils.getUIInt("ScrollBar.width", 10)); + return new Rectangle(px, py, comboWidth, fitRectangle.height + FineUIUtils.getAndScaleInt("ScrollBar.width", 10)); } return fitRectangle; } From 3f24fd91cec405f75ca9f5f8befaea6e4a914cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Tue, 22 Oct 2024 13:53:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0jira=20toolbar=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/DesignerFrameFileDealerPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index d0ad936913..ce282861e4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -342,6 +342,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt renameAction.setEnabled(false); delFileAction.setEnabled(false); vcsAction.setEnabled(false); + this.revalidate(); this.repaint(); } From 1de9cea90f92412e22aba63d16c35243312d53bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Tue, 22 Oct 2024 13:54:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-138174=20fix:=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86/=E5=85=AC=E5=BC=8F=E9=9D=A2=E6=9D=BF=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E4=B8=8A=E8=BE=B9=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/data/datapane/sqlpane/SQLEditPane.java | 5 ++--- .../src/main/java/com/fr/design/formula/FormulaPane.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java index c0849032d3..c188b363eb 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java @@ -1,5 +1,6 @@ package com.fr.design.data.datapane.sqlpane; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.core.DataCoreUtils; import com.fr.data.core.db.TableProcedure; import com.fr.design.actions.UpdateAction; @@ -10,7 +11,6 @@ import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; -import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.text.BadLocationException; import javax.swing.text.Document; @@ -57,8 +57,7 @@ public class SQLEditPane extends RSyntaxTextArea { if (requestDroptarget) { new SQLPaneDropTarget(this); } - setBorder(null); - + setBorder(new ScaledEmptyBorder(2, 2, 2, 2)); } diff --git a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java index af825fb4a6..aaf95bd765 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FormulaPane.java @@ -315,7 +315,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula { // text initFormulaTextArea(); UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea); - formulaTextArea.setBorder(null); + formulaTextArea.setBorder(new ScaledEmptyBorder(2, 2, 2, 2)); formulaTextAreaScrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); // buttonPane