Browse Source

REPORT-133167 & REPORT-133157 fix:细节缩放问题修复

fbp/merge
Levy.Xie-解安森 5 months ago
parent
commit
1f12b37afe
  1. 8
      designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java
  2. 3
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

8
designer-form/src/main/java/com/fr/design/parameter/ParameterPropertyPane.java

@ -1,5 +1,6 @@
package com.fr.design.parameter; package com.fr.design.parameter;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.design.border.FineBorderFactory; import com.fr.design.border.FineBorderFactory;
import com.fr.design.constants.UIConstants; import com.fr.design.constants.UIConstants;
@ -23,6 +24,8 @@ import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import static com.fine.theme.utils.FineUIScale.scale;
public class ParameterPropertyPane extends JPanel{ public class ParameterPropertyPane extends JPanel{
private ParameterToolBarPane toolbarPane; private ParameterToolBarPane toolbarPane;
private ParaDefinitePane paraPane; private ParaDefinitePane paraPane;
@ -32,8 +35,7 @@ public class ParameterPropertyPane extends JPanel{
private static ParameterPropertyPane THIS; private static ParameterPropertyPane THIS;
private boolean isEditing = false; private boolean isEditing = false;
private static final int PADDING_MIDDLE = 10; private static final int ADD_PARA_PANE_MAX_HEIGHT = scale(120);
private static final int ADD_PARA_PANE_MAX_HEIGHT = 95;
public static final ParameterPropertyPane getInstance() { public static final ParameterPropertyPane getInstance() {
if (THIS == null) { if (THIS == null) {
@ -138,7 +140,7 @@ public class ParameterPropertyPane extends JPanel{
private void setEditor(FormDesigner editor) { private void setEditor(FormDesigner editor) {
if (formHierarchyTreePaneWrapper == null) { if (formHierarchyTreePaneWrapper == null) {
formHierarchyTreePaneWrapper = new JPanel(new BorderLayout()); formHierarchyTreePaneWrapper = new JPanel(new BorderLayout());
formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, 0)); formHierarchyTreePaneWrapper.setBorder(new ScaledEmptyBorder(0, 10, 0, 0));
this.add(formHierarchyTreePaneWrapper, BorderLayout.CENTER); this.add(formHierarchyTreePaneWrapper, BorderLayout.CENTER);
} }
formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance()); formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance());

3
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -49,6 +49,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.fine.theme.utils.FineUIScale.scale;
import static com.fine.theme.utils.FineUIStyle.BRAND_COLOR_LABEL; import static com.fine.theme.utils.FineUIStyle.BRAND_COLOR_LABEL;
/** /**
@ -65,7 +66,7 @@ public class UserInfoLabel extends UILabel {
private static final String MESSAGE_KEY = "messageCount"; private static final String MESSAGE_KEY = "messageCount";
private static final int MIN_MESSAGE_COUNT = 1; private static final int MIN_MESSAGE_COUNT = 1;
private static final int MENU_HEIGHT = 20; private static final int MENU_HEIGHT = scale(24);
private static final int DEFAULT_BBS_UID = 0; private static final int DEFAULT_BBS_UID = 0;

Loading…
Cancel
Save