Browse Source

控件管理/报表填报属性/超级链接/服务器参数

newui
renekton 4 months ago
parent
commit
075e81a392
  1. 5
      designer-base/src/main/java/com/fr/design/menu/MenuDef.java

5
designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@ -1,6 +1,7 @@
package com.fr.design.menu; package com.fr.design.menu;
import com.fine.theme.icon.LazyIcon; import com.fine.theme.icon.LazyIcon;
import com.fine.theme.utils.FineUIScale;
import com.fine.theme.utils.FineUIStyle; import com.fine.theme.utils.FineUIStyle;
import com.fr.base.svg.IconUtils; import com.fr.base.svg.IconUtils;
import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.HistoryTemplateListCache;
@ -43,7 +44,7 @@ import static com.fine.theme.utils.FineUIStyle.setStyle;
public class MenuDef extends ShortCut { public class MenuDef extends ShortCut {
private static final int MENU_DEFAULTWDITH = 156; private static final int MENU_DEFAULTWDITH = 156;
private static final int BLANK_WIDTH = 30; private static final int BLANK_WIDTH = 18;
private static final Set<String> FORBIDDEN_SET = new HashSet<>(); private static final Set<String> FORBIDDEN_SET = new HashSet<>();
@ -565,7 +566,7 @@ public class MenuDef extends ShortCut {
private void updatePopupMenuSize() { private void updatePopupMenuSize() {
int preferredWidth = popupMenu.getPreferredSize().width - BLANK_WIDTH; // 减少行尾的空白部分 int preferredWidth = popupMenu.getPreferredSize().width - BLANK_WIDTH; // 减少行尾的空白部分
int popupMenuWidth = preferredWidth > MENU_DEFAULTWDITH ? preferredWidth : MENU_DEFAULTWDITH; int popupMenuWidth = preferredWidth > MENU_DEFAULTWDITH ? preferredWidth : MENU_DEFAULTWDITH;
popupMenu.setPopupSize(new Dimension(popupMenuWidth, popupMenu.getPreferredSize().height)); popupMenu.setPopupSize(FineUIScale.scale(new Dimension(popupMenuWidth, popupMenu.getPreferredSize().height)));
} }

Loading…
Cancel
Save