Browse Source

修改为缩放border

newui
renekton 7 months ago
parent
commit
ad7699e8b7
  1. 3
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
  2. 5
      designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java
  3. 2
      designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java

3
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java

@ -1,5 +1,6 @@
package com.fr.design.hyperlink; package com.fr.design.hyperlink;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.BaseFormula; import com.fr.base.BaseFormula;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicDialog;
@ -112,7 +113,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
@Override @Override
protected void initComponents() { protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); this.setBorder(new ScaledEmptyBorder(0, 0, 10, 0));
final List<Component[]> dialogComponents = new ArrayList<>(); final List<Component[]> dialogComponents = new ArrayList<>();
final List<Component[]> othersComponents = new ArrayList<>(); final List<Component[]> othersComponents = new ArrayList<>();

5
designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java

@ -1,6 +1,7 @@
package com.fr.design.mainframe.theme; package com.fr.design.mainframe.theme;
import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIScale;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.theme.TemplateTheme; import com.fr.base.theme.TemplateTheme;
import com.fr.base.theme.TemplateThemeConfig; import com.fr.base.theme.TemplateThemeConfig;
import com.fr.base.theme.settings.ThemeThumbnail; import com.fr.base.theme.settings.ThemeThumbnail;
@ -72,8 +73,8 @@ public abstract class TemplateThemeProfilePane<T extends TemplateTheme> extends
} }
private void initializePane() { private void initializePane() {
setLayout(new BorderLayout(5, 0)); setLayout(new BorderLayout(FineUIScale.scale(5), 0));
setBorder(BorderFactory.createEmptyBorder(10, 10, 0, 10)); setBorder(new ScaledEmptyBorder(10, 10, 0, 10));
add(createLeftPane(), BorderLayout.CENTER); add(createLeftPane(), BorderLayout.CENTER);
add(createRightPane(), BorderLayout.EAST); add(createRightPane(), BorderLayout.EAST);
} }

2
designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java vendored

@ -137,7 +137,7 @@ public class EnvDetectorDialog extends JDialog {
private JPanel createHeaderPanel() { private JPanel createHeaderPanel() {
JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
headerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); headerPanel.setBorder(new ScaledEmptyBorder(0, 0, 10, 0));
this.detectButton = new UIButton(buttonStatus.getDesc()); this.detectButton = new UIButton(buttonStatus.getDesc());
FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY); FineUIStyle.setStyle(detectButton, FineUIStyle.STYLE_PRIMARY);
detectButton.setToolTipText(buttonStatus.getDesc()); detectButton.setToolTipText(buttonStatus.getDesc());

Loading…
Cancel
Save