From bbf5227b0937f0be0bc73e6a074479b59fc79984 Mon Sep 17 00:00:00 2001 From: obo Date: Mon, 19 Aug 2024 17:30:26 +0800 Subject: [PATCH] =?UTF-8?q?INO-21074=20FRM=E5=8F=82=E6=95=B0=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/CenterRegionContainerPane.java | 4 ++-- .../fr/design/mainframe/FormParaWidgetPane.java | 16 +++++++++------- .../mobile/component/MobileBookMarkUsePane.java | 3 ++- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java index 382e22512f..c99a653101 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/CenterRegionContainerPane.java @@ -98,7 +98,7 @@ public class CenterRegionContainerPane extends JPanel { this.setLayout(new BorderLayout()); this.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER); this.add(toolbarPane, BorderLayout.NORTH); - + BidiUtils.applyOrientationByLocale(this); } public ToolBarMenuDock getToolBarMenuDock() { @@ -230,7 +230,7 @@ public class CenterRegionContainerPane extends JPanel { } // 颜色，字体那些按钮的工具栏 - toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.CENTER); + toolbarPane.add(toolbarComponent = ad.resetToolBar(toolbarComponent, plus), BorderLayout.CENTER); JPanel customNorthPane = strategy.customNorthPane(toolbarPane,plus); if (!isExist(customNorthPane)){ this.removeNorth(); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index 57e49780cf..a5e201c6a2 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import com.fr.base.BaseUtils; +import com.fr.base.i18n.BidiUtils; import com.fr.base.svg.IconUtils; import com.fr.design.ExtraDesignClassManager; import com.fr.design.constants.UIConstants; @@ -136,7 +137,7 @@ public class FormParaWidgetPane extends JPanel { } public FormParaWidgetPane() { - setLayout(new FlowLayout(FlowLayout.LEFT)); + setLayout(new FlowLayout(FlowLayout.LEADING)); DesignerContext.getDesignerFrame().getCenterTemplateCardPane().addComponentListener(new ComponentAdapter() { @Override public void componentResized(ComponentEvent e) { @@ -158,19 +159,20 @@ public class FormParaWidgetPane extends JPanel { } }); initFormParaComponent(); + BidiUtils.applyOrientationByLocale(this); } private void initWidgetTypePopUp() { - JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); + JPanel widgetPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0)); loadPredefinedWidget(); int rowNum = calculateWidgetWindowRowNum(); - JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel westPanel = new JPanel(new FlowLayout(FlowLayout.LEADING)); for (WidgetOption o : loadWidgetOptions()) { westPanel.add(new ToolBarButton(o)); } int x = commonWidgetNum * (widgetButtonWidth + smallGAP) - smallGAP; westPanel.setPreferredSize(new Dimension(x, (int) (rowNum * westPanel.getPreferredSize().getHeight()))); - JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel eastPane = new JPanel(new FlowLayout(FlowLayout.LEADING)); for (WidgetOption no : predifinedwidgeList) { eastPane.add(new ToolBarButton(no)); } @@ -196,7 +198,7 @@ public class FormParaWidgetPane extends JPanel { private void initChartTypePopUp() { if (chartTypePopupMenu == null) { - JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel componentsPara = new JPanel(new FlowLayout(FlowLayout.LEADING)); WidgetOption[] chartOptions = loadChartOptions(); for (WidgetOption chartOption : chartOptions) { ToolBarButton button = new ToolBarButton(chartOption); @@ -374,7 +376,7 @@ public class FormParaWidgetPane extends JPanel { (int) jSeparatorLayout.getLocation().getY()); } }); - labelPane.add(chartPopUpButton, BorderLayout.EAST); + labelPane.add(chartPopUpButton, BorderLayout.LINE_END); chartPane.add(labelPane, BorderLayout.SOUTH); return chartPane; } @@ -401,7 +403,7 @@ public class FormParaWidgetPane extends JPanel { } }); - labelPane.add(chartPopUpButton, BorderLayout.EAST); + labelPane.add(chartPopUpButton, BorderLayout.LINE_END); widgetPane.add(labelPane, BorderLayout.SOUTH); return widgetPane; } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkUsePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkUsePane.java index 7038330697..83182af9a4 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkUsePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkUsePane.java @@ -1,5 +1,6 @@ package com.fr.design.widget.ui.designer.mobile.component; +import com.fr.base.i18n.BidiUtils; import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreator; @@ -66,7 +67,7 @@ public class MobileBookMarkUsePane extends BasicPane { showBookMarkPane.setBorder( BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0)); wrapPane.add(showBookMarkPane, BorderLayout.CENTER); - this.add(showBookMarkPane, BorderLayout.CENTER); + this.add(BidiUtils.applyOrientationByLocale(showBookMarkPane), BorderLayout.CENTER); } public void populate(XCreator xCreator) {