Browse Source

INO-21074 页眉页脚完善

persist/11.0-arabic^2
obo 10 months ago
parent
commit
e1f5c68b5e
  1. 6
      designer-base/src/main/java/com/fr/design/style/FRFontPane.java
  2. 4
      designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java

6
designer-base/src/main/java/com/fr/design/style/FRFontPane.java

@ -4,6 +4,7 @@
package com.fr.design.style;
import com.fr.base.FRContext;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.LineComboBox;
@ -137,7 +138,7 @@ public class FRFontPane extends BasicPane {
fireStateChanged();
}
});
foregroundPane.add(foregroundColorPane, BorderLayout.WEST);
foregroundPane.add(foregroundColorPane, BorderLayout.LINE_START);
// center pane
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@ -146,7 +147,7 @@ public class FRFontPane extends BasicPane {
// other reportFont dialog
JPanel otherFontPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(otherFontPane, BorderLayout.WEST);
centerPane.add(otherFontPane, BorderLayout.LINE_START);
// otherFontPane.setLayout(FRGUIPaneFactory.createBorderLayout());
// effects pane
@ -208,6 +209,7 @@ public class FRFontPane extends BasicPane {
//peteter:这里主动从Context, 获得默认的FRFont的值.
DefaultValues defaultValues = FRContext.getDefaultValues();
populate(defaultValues.getFRFont());
BidiUtils.applyOrientationByLocale(this);
}
public void addChangeListener(ChangeListener changeListener) {

4
designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java

@ -13,6 +13,7 @@ import com.fr.base.headerfooter.NumberOfPageHFElement;
import com.fr.base.headerfooter.PageNumberHFElement;
import com.fr.base.headerfooter.TextHFElement;
import com.fr.base.headerfooter.TimeHFElement;
import com.fr.base.i18n.BidiUtils;
import com.fr.design.dialog.BasicPane;
import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.formula.FormulaFactory;
@ -71,7 +72,8 @@ public class HFAttributesEditDialog extends BasicPane {
// topControlPane.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel topControlButtonPane =FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
topControlPane.add(topControlButtonPane, BorderLayout.WEST);
topControlPane.add(topControlButtonPane, BorderLayout.LINE_START);
BidiUtils.applyOrientationByLocale(topControlPane);
moveLeftButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Move_Left"));

Loading…
Cancel
Save