From 59145032022da02e057b8c5519d8eafb74661489 Mon Sep 17 00:00:00 2001 From: lemon Date: Tue, 22 Oct 2024 15:37:07 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-135996=20fix=EF=BC=9A=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=A7=86=E8=A7=89=E9=AA=8C=E6=94=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/chart/gui/ChartTypeButtonPane.java | 4 ++-- .../java/com/fr/design/sort/common/SortColumnRowPane.java | 4 ++-- .../java/com/fr/design/sort/header/HeaderSortRulePane.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index 1ebc487fc4..d6f46b9332 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -457,9 +457,9 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private class ChartChangeButton extends UIToggleButton { - private final double DEL_WIDTH = scale(10); + private final double DEL_WIDTH = scale(13); private final double DOWN_HEIGHT = scale(1); - private final Icon closeIcon = new LazyIcon("closeTag", 8); + private final Icon closeIcon = new LazyIcon("closeTag", 12); private boolean isMoveOn = false; private String buttonName = ""; diff --git a/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java b/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java index b2d0e6dd08..6b8929bf22 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/common/SortColumnRowPane.java @@ -82,9 +82,9 @@ public class SortColumnRowPane extends JPanel implements UIObserver { void initTextField() { colJTextField = new JTextField(); - colJTextField.setEditable(false); + colJTextField.setEnabled(false); rowJTextField = new JTextField(); - rowJTextField.setEditable(false); + rowJTextField.setEnabled(false); } void initSelectButton() { diff --git a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java index 6df0272410..1befa18bf3 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/header/HeaderSortRulePane.java @@ -94,6 +94,7 @@ public class HeaderSortRulePane extends JPanel { private ColorControlWindow colorSelector; IconButton(SortRule sortRule) { + this.setLayout(new BorderLayout()); this.sortRule = sortRule; initComponents(); }