From 4c9714dd0e0572de855b1315340e454c311b090e Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 7 Aug 2024 18:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=B8=80=E4=B8=8BJListControlPane?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/tabledata/tabledatapane/MaxMemRowCountPanel.java | 2 ++ .../main/java/com/fr/design/gui/controlpane/JControlPane.java | 3 ++- .../java/com/fr/design/gui/controlpane/JListControlPane.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index af2b71a7c6..3afe9728d5 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -2,6 +2,7 @@ package com.fr.design.data.tabledata.tabledatapane; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -67,6 +68,7 @@ public class MaxMemRowCountPanel extends UIToolbar { }; public MaxMemRowCountPanel() { + this.setLayout(new FlowLayout(FlowLayout.LEADING)); this.setFloatable(false); this.setRollover(true); this.setBackground(UIConstants.NORMAL_BACKGROUND); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java index 37fef509db..1dccf84b3f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlPane.java @@ -1,5 +1,6 @@ package com.fr.design.gui.controlpane; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.controlpane.shortcutfactory.AbstractShortCutFactory; import com.fr.design.gui.controlpane.shortcutfactory.OldShortCutFactory; @@ -106,7 +107,7 @@ abstract class JControlPane extends BasicPane implements UnrepeatedNameHelper, S this.creators = this.createNameableCreators(); initCardPane(); // SplitPane - JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, getLeftPane(), cardPane); + JSplitPane mainSplitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, BidiUtils.applyOrientationByLocale(getLeftPane()), cardPane); mainSplitPane.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); mainSplitPane.setOneTouchExpandable(true); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index 8ff528b871..8de29491e5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -369,6 +369,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr //iconLabel和textLabel的背景颜色不会被JList背景颜色覆盖,开发者自定义 this.textLabel.setOpaque(true); this.iconLabel.setOpaque(true); + BidiUtils.applyOrientationByLocale(this); } @Override