Browse Source

颜色面板

persist/11.0-arabic
obo 6 months ago
parent
commit
6c35381353
  1. 3
      designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java
  2. 9
      designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

3
designer-base/src/main/java/com/fr/design/style/AbstractSelectBox.java

@ -1,5 +1,6 @@
package com.fr.design.style;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIButtonUI;
@ -82,7 +83,7 @@ public abstract class AbstractSelectBox<T> extends AbstractPopBox implements Mou
triggleButton.addMouseListener(this);
this.add(displayPane, BorderLayout.CENTER);
this.add(triggleButton, BorderLayout.EAST);
this.add(triggleButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
this.addAncestorListener(new AncestorListener() {
public void ancestorAdded(AncestorEvent event) {

9
designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

@ -1,5 +1,6 @@
package com.fr.design.report;
import com.fr.base.i18n.BidiUtils;
import com.fr.base.theme.ReportTheme;
import com.fr.base.theme.TemplateTheme;
import com.fr.base.theme.settings.ThemedReportBodyStyle;
@ -16,6 +17,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.theme.ui.BorderUtils;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.Background;
import com.fr.page.ReportSettingsProvider;
import com.fr.report.stable.ReportSettings;
@ -23,6 +25,7 @@ import com.fr.report.stable.ReportSettings;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import javax.swing.border.CompoundBorder;
import javax.swing.border.TitledBorder;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@ -55,7 +58,7 @@ public class NewReportBackgroundPane extends BasicPane {
container.setPreferredSize(new Dimension(container.getPreferredSize().width, 30));
container.add(isExportBackgroundCheckBox);
container.add(isPrintBackgroundCheckBox);
return container;
return BidiUtils.applyOrientationByLocale(container);
}
@Override
@ -116,6 +119,7 @@ public class NewReportBackgroundPane extends BasicPane {
uiLabelPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Background_Fill")), BorderLayout.NORTH);
uiLabelPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
backgroundPane = new ReportBackgroundSpecialPane();
BidiUtils.applyOrientationByLocale(backgroundPane);
backgroundLabeledPane = TableLayoutHelper.createCommonTableLayoutPane(
new Component[][]{ new Component[] { uiLabelPane, backgroundPane } },
new double[] { p }, new double[] { SETTING_LABEL_WIDTH, f}, IntervalConstants.INTERVAL_L1
@ -142,7 +146,7 @@ public class NewReportBackgroundPane extends BasicPane {
contentContainer.setBorder(BorderFactory.createEmptyBorder());
contentContainer.setPreferredSize(new Dimension(600, 540));
contentContainer.add(createLeftPane(), BorderLayout.CENTER);
contentContainer.add(createRightPane(), BorderLayout.EAST);
contentContainer.add(createRightPane(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
addAttributeChangeListener(new AttributeChangeListener() {
@Override
@ -171,6 +175,7 @@ public class NewReportBackgroundPane extends BasicPane {
titledPane.setPreferredSize(new Dimension(377, 502));
container.add(titledPane, BorderLayout.WEST);
titledPane.add(previewPane, BorderLayout.WEST);
BidiUtils.applyOrientationByLocale(titledPane);
previewPane.setPreferredSize(new Dimension(367, 480));
return container;

Loading…
Cancel
Save