Browse Source

按钮间距、布局、optionPaneUI设置确定button style;主题设置面板缩放

newui
renekton 3 months ago
parent
commit
c66aaa287c
  1. 8
      designer-base/src/main/java/com/fine/theme/light/ui/FineOptionPaneUI.java
  2. 2
      designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java
  3. 3
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java
  4. 2
      designer-realize/src/main/java/com/fr/design/report/NewReportBackgroundPane.java

8
designer-base/src/main/java/com/fine/theme/light/ui/FineOptionPaneUI.java

@ -10,8 +10,16 @@ import javax.swing.plaf.ComponentUI;
import java.awt.Component; import java.awt.Component;
import java.awt.Container; import java.awt.Container;
/**
* @author Renekton
* @since 2024/08/15
* Created on 2024/08/15
*/
public class FineOptionPaneUI extends FlatOptionPaneUI { public class FineOptionPaneUI extends FlatOptionPaneUI {
/**
* 注册当前类的UI对象
*/
public static ComponentUI createUI(JComponent c ) { public static ComponentUI createUI(JComponent c ) {
return new FineOptionPaneUI(); return new FineOptionPaneUI();
} }

2
designer-base/src/main/java/com/fr/design/file/DefaultTemplateTreeDefineProcessor.java

@ -2,6 +2,7 @@ package com.fr.design.file;
import com.fine.theme.icon.LazyIcon; import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle;
import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.actions.file.DelFileAction; import com.fr.design.actions.file.DelFileAction;
@ -379,6 +380,7 @@ public class DefaultTemplateTreeDefineProcessor extends AbstractTemplateTreeDefi
// 确认按钮,默认就可用 // 确认按钮,默认就可用
confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm")); confirmButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Confirm"));
FineUIStyle.setStyle(confirmButton, FineUIStyle.STYLE_PRIMARY);
confirmButton.addActionListener(new ActionListener() { confirmButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

3
designer-base/src/main/java/com/fr/design/gui/controlpane/UIListGroupControlPane.java

@ -3,9 +3,7 @@ package com.fr.design.gui.controlpane;
import com.fine.theme.light.ui.FineRoundBorder; import com.fine.theme.light.ui.FineRoundBorder;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIUtils; import com.fine.theme.utils.FineUIUtils;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.design.beans.BasicBeanPane; import com.fr.design.beans.BasicBeanPane;
import com.fr.design.border.FineBorderFactory;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
@ -558,7 +556,6 @@ public abstract class UIListGroupControlPane extends UIControlPane implements Li
} }
}; };
label.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, FineUIUtils.getUIColor("fill.hover", "fill.hover"))); label.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, FineUIUtils.getUIColor("fill.hover", "fill.hover")));
label.setBackground(FineUIUtils.getUIColor("background.normal", "background.normal"));
label.setForeground(UIManager.getColor("List.wrapper.text.fontColor")); label.setForeground(UIManager.getColor("List.wrapper.text.fontColor"));
label.setFont(label.getFont().deriveFont(11F)); label.setFont(label.getFont().deriveFont(11F));
label.setPreferredSize(new Dimension(this.getPreferredSize().width, FineUIScale.scale(24))); label.setPreferredSize(new Dimension(this.getPreferredSize().width, FineUIScale.scale(24)));

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

@ -159,6 +159,7 @@ public class NewReportBackgroundPane extends BasicPane {
private JPanel createLeftPane() { private JPanel createLeftPane() {
JPanel panel = new JPanel(new BorderLayout()); JPanel panel = new JPanel(new BorderLayout());
panel.add(previewPane, BorderLayout.CENTER); panel.add(previewPane, BorderLayout.CENTER);
previewPane.setPreferredSize(FineUIScale.scale(new Dimension(367, 480)));
return Layouts.column( return Layouts.column(
10, 10,
@ -170,6 +171,7 @@ public class NewReportBackgroundPane extends BasicPane {
private JPanel createRightPane() { private JPanel createRightPane() {
JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel container = FRGUIPaneFactory.createBorderLayout_S_Pane();
container.setBorder(BorderFactory.createEmptyBorder()); container.setBorder(BorderFactory.createEmptyBorder());
container.setPreferredSize(FineUIScale.scale(new Dimension(263, 502)));
container.add(themePane, BorderLayout.NORTH); container.add(themePane, BorderLayout.NORTH);
return container; return container;
} }

Loading…
Cancel
Save