Browse Source

用定好的常量替代

fbp/release
renekton 2 months ago
parent
commit
2ed62939b9
  1. 5
      designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/gui/style/ComponentIntegralStylePane.java
  3. 5
      designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java
  4. 3
      designer-base/src/main/java/com/fr/design/gui/style/TextInsetImageBackgroundSpecialPane.java
  5. 3
      designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java

5
designer-base/src/main/java/com/fr/design/gui/style/AbstractTranslucentBackgroundSpecialPane.java

@ -2,6 +2,7 @@ package com.fr.design.gui.style;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.frpane.UIPercentDragPane; import com.fr.design.gui.frpane.UIPercentDragPane;
@ -58,14 +59,14 @@ public abstract class AbstractTranslucentBackgroundSpecialPane<T extends Backgro
new JComponent[][]{ new JComponent[][]{
{backgroundLabelPane, backgroundPane} {backgroundLabelPane, backgroundPane}
}, },
new double[]{1.2, 3}); new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
JPanel opacityComposedPane = FineLayoutBuilder.compatibleTableLayout(10, JPanel opacityComposedPane = FineLayoutBuilder.compatibleTableLayout(10,
new JComponent[][]{ new JComponent[][]{
{new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))}, {new UILabel(""), FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
{new UILabel(""), opacityPane} {new UILabel(""), opacityPane}
}, },
new double[]{1.2, 3}); new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
opacityComposedPane.setBorder(new ScaledEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0)); opacityComposedPane.setBorder(new ScaledEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
opacityComposedPane.setVisible(false); opacityComposedPane.setVisible(false);

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

@ -1,6 +1,7 @@
package com.fr.design.gui.style; package com.fr.design.gui.style;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
@ -72,7 +73,7 @@ public class ComponentIntegralStylePane extends AbstractBorderPackerPane {
{this.borderPane, null}, {this.borderPane, null},
{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner}, {FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")), cornerSpinner},
}, },
new double[]{1.2, 3}); new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
this.add(content, BorderLayout.NORTH); this.add(content, BorderLayout.NORTH);
} }

5
designer-base/src/main/java/com/fr/design/gui/style/ComponentTitleStylePane.java

@ -3,6 +3,7 @@ package com.fr.design.gui.style;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.fr.base.Utils; import com.fr.base.Utils;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.formula.TinyFormulaPane; import com.fr.design.formula.TinyFormulaPane;
import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.gui.ibutton.UIButtonGroup;
@ -191,7 +192,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
return FineLayoutBuilder.compatibleTableLayout(10, return FineLayoutBuilder.compatibleTableLayout(10,
new JComponent[][]{{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}}, new JComponent[][]{{FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), textContentPane}},
new double[]{1.2, 3}); new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
} }
private JPanel createTitleOtherSettingPane() { private JPanel createTitleOtherSettingPane() {
@ -211,7 +212,7 @@ public class ComponentTitleStylePane extends AbstractBorderPackerPane {
JPanel buttonPane = FineLayoutBuilder.compatibleTableLayout(10, new JComponent[][] { JPanel buttonPane = FineLayoutBuilder.compatibleTableLayout(10, new JComponent[][] {
{fontSizeComboBox, fontColorSelectPane, fontItalicButton, fontBoldButton, fontUnderlineButton}, {fontSizeComboBox, fontColorSelectPane, fontItalicButton, fontBoldButton, fontUnderlineButton},
}, new double[]{1.2, 3}); }, new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel containerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
containerPane.add(buttonPane, BorderLayout.NORTH); containerPane.add(buttonPane, BorderLayout.NORTH);

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

@ -5,6 +5,7 @@ import com.fr.base.Style;
import com.fr.base.background.ImageBackground; import com.fr.base.background.ImageBackground;
import com.fr.base.background.ImageFileBackground; import com.fr.base.background.ImageFileBackground;
import com.fr.design.border.UIRoundedBorder; import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserver;
@ -163,7 +164,7 @@ public class TextInsetImageBackgroundSpecialPane extends JPanel implements UIObs
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Inset_Padding"))}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Inset_Padding"))},
{null, this.imagePaddingPane} {null, this.imagePaddingPane}
}, },
new double[]{1.2, 3}); new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT});
} }
private void initImageFileChooserIfNotExist() { private void initImageFileChooserIfNotExist() {

3
designer-base/src/main/java/com/fr/design/mainframe/theme/edit/component/ComponentMarginStylePane.java

@ -2,6 +2,7 @@ package com.fr.design.mainframe.theme.edit.component;
import com.fine.theme.utils.FineLayoutBuilder; import com.fine.theme.utils.FineLayoutBuilder;
import com.fr.base.theme.settings.ThemedComponentStyle; import com.fr.base.theme.settings.ThemedComponentStyle;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.ispinner.UISpinner;
@ -53,7 +54,7 @@ public class ComponentMarginStylePane extends JPanel {
JPanel panel = FineLayoutBuilder.compatibleTableLayout(10, JPanel panel = FineLayoutBuilder.compatibleTableLayout(10,
new Component[][]{new Component[]{uiLabel, createPaddingPane()}}, new Component[][]{new Component[]{uiLabel, createPaddingPane()}},
new double[]{1.2, 3} new double[]{LayoutConstants.LEFT_WEIGHT, LayoutConstants.RIGHT_WEIGHT}
); );
this.add(panel); this.add(panel);
} }

Loading…
Cancel
Save