From 95176e98086046634393fb61e4b1c769389c9f04 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 6 Aug 2024 16:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E5=85=A5-=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/report/SelectImagePane.java | 3 ++- .../main/java/com/fr/design/chart/ChartTypePane.java | 11 +++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java index 7781233aac..29cbab12b7 100644 --- a/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java +++ b/designer-base/src/main/java/com/fr/design/report/SelectImagePane.java @@ -1,6 +1,7 @@ package com.fr.design.report; import com.fr.base.Style; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.frpane.ImgChooseWrapper; import com.fr.design.gui.ibutton.UIButton; @@ -83,7 +84,7 @@ public class SelectImagePane extends BasicPane { previewOwnerPane.add(new JScrollPane(previewPane)); JPanel selectFilePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - previewContainerPane.add(selectFilePane, BorderLayout.EAST); + previewContainerPane.add(selectFilePane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); selectFilePane.setBorder(BorderFactory .createEmptyBorder(8, 2, 4, 0)); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index c34fcce653..987f65687c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -4,6 +4,7 @@ package com.fr.design.chart; */ import com.fr.base.chart.chartdata.CallbackEvent; +import com.fr.base.i18n.BidiUtils; import com.fr.chart.chartattr.ChartCollection; import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chartx.attr.ChartProvider; @@ -71,11 +72,13 @@ public class ChartTypePane extends ChartCommonWizardPane implements CallbackEven JScrollPane subListPane = new JScrollPane(iconViewList); //iconPane.add mainTypeList.setSelectedIndex(0); - - JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); - spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))); + Component left = BidiUtils.rtl() ? subListPane :typeScrollPane; + Component right = BidiUtils.rtl() ? typeScrollPane :subListPane; + JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, left, right); + spane.setDividerLocation(BidiUtils.rtl() ? 500 : 120); + spane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")))); this.add(spane); + BidiUtils.applyOrientationByLocale(this); iconViewList.setSelectedIndex(0); }