Browse Source

REPORT-111566 【控件显示增强】设计面板视觉优化

release/11.0
obo 11 months ago
parent
commit
d62e1c4160
  1. 4
      designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetTextStylePane.java
  2. 2
      designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java
  3. 2
      designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

4
designer-base/src/main/java/com/fr/widgettheme/theme/panel/WidgetTextStylePane.java

@ -5,6 +5,7 @@ import com.fr.design.gui.frpane.FontSizeComboPane;
import com.fr.widgettheme.theme.widget.style.ThemeTextStyle;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.JPanel;
import java.awt.Color;
import java.awt.Dimension;
@ -30,12 +31,13 @@ public class WidgetTextStylePane extends JPanel {
}
public WidgetTextStylePane(Vector<Integer> fontSizes, int preferredWidth) {
this.setLayout(new FlowLayout(FlowLayout.LEFT));
this.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
this.setBorder(BorderFactory.createEmptyBorder());
fontSizePane = new FontSizeComboPane(fontSizes);
fontColorButton = new UIColorButton();
fontSizePane.setPreferredSize(new Dimension(preferredWidth, fontSizePane.getPreferredSize().height));
this.add(fontSizePane);
add(Box.createHorizontalStrut(5));
this.add(fontColorButton);
}

2
designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@ -94,7 +94,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
borderRadiusSpinner = new UIBoundSpinner(0, Integer.MAX_VALUE, 1);
frFontPane = new FRFontPane();
buttonStyleDefinedPane = new ButtonStyleDefinedPane();
textStylePane = new WidgetTextStylePane(100);
textStylePane = new WidgetTextStylePane(105);
selectBgColorBox = new NewColorSelectBox(160, true);
paneMap.put(StyleSetting.STYLE_TYPE, createStyleTypePane());
paneMap.put(StyleSetting.THEME_COLOR, colorSelectBox);

2
designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@ -182,7 +182,7 @@ public class EditToolBar extends BasicPane {
if(WidgetThemeDesignerUtils.enableWidgetEnhance()) {
backgroundPane.add(createButtonColorGroup());
}
backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background")));
backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_ToolBar_Style_Setting")));
this.add(backgroundPane, BorderLayout.SOUTH);
}

Loading…
Cancel
Save