From ea478ba9c1738cf92519f47072a0bb4c36a0a9f0 Mon Sep 17 00:00:00 2001 From: obo Date: Tue, 6 Aug 2024 14:46:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/module/ChartEmptyDataStylePane.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index 72228e094d..0977f0026d 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -3,6 +3,7 @@ package com.fr.design.module; import com.fr.base.BaseUtils; import com.fr.base.ChartEmptyDataStyleConf; import com.fr.base.Style; +import com.fr.base.i18n.BidiUtils; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButtonGroup; @@ -71,7 +72,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel content = new JPanel(new BorderLayout()); content.add(creatNorthPane(), BorderLayout.NORTH); content.add(creatCenterPane(), BorderLayout.CENTER); - return content; + return BidiUtils.applyOrientationByLocale(content); } private JPanel creatNorthPane() { @@ -100,10 +101,10 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { UILabel promptContent = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); imageContent = new UILabel(Toolkit.i18nText("Fine-Design_Report_Image")); - JPanel emptyPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEFT, TEN, 0); - JPanel imagePane = GUICoreUtils.createFlowPane(new Component[]{imageContent, imageData}, FlowLayout.LEFT, TEN, 0); + JPanel emptyPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, TEN, 0); + JPanel imagePane = GUICoreUtils.createFlowPane(new Component[]{imageContent, imageData}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, TEN, 0); imagePane.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0)); - JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{emptyPane, imagePane}, FlowLayout.LEFT, 0, 0); + JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{emptyPane, imagePane}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0); northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); return northPane; } @@ -118,7 +119,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { JPanel previewOwnerPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_Preview")); previewOwnerPane.setLayout(new BorderLayout()); previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER); - previewContainerPane.add(initSelectFilePane(), BorderLayout.EAST); + previewContainerPane.add(initSelectFilePane(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST); previewPane = new ImagePreviewPane(); previewOwnerPane.add(new JScrollPane(previewPane));