Browse Source

Pull request #13571: REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常

Merge in DESIGN/design from ~JACKY.LI/design:release/11.0 to release/11.0

* commit '02d947b391f624bd8c452dba740530238e5fcf08':
  REPORT-114164 控件扩展样式-图文按钮图标格添加至12个以上,显示异常
release/11.0
jacky.li-李星 9 months ago
parent
commit
683599cbc8
  1. 17
      designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java

17
designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/radiogroup/ImageCustomDefinePane.java

@ -24,6 +24,7 @@ import com.fr.form.ui.mobile.radiogroup.ImageMobileStyle;
import com.fr.general.FRFont; import com.fr.general.FRFont;
import javax.swing.*; import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.*; import java.awt.*;
@ -281,18 +282,22 @@ public class ImageCustomDefinePane extends MobileStyleCustomDefinePane {
UILabel initialLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Init")); UILabel initialLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Init"));
UILabel selectedLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Select")); UILabel selectedLabel = DesignerUtils.createConfigLabel(Toolkit.i18nText("Fine-Plugin-RadioGroup_Icon_Select"));
initialLabel.setVerticalAlignment(SwingConstants.TOP);
initialLabel.setBorder(new EmptyBorder(5, 0, 0, 0));
selectedLabel.setVerticalAlignment(SwingConstants.TOP);
selectedLabel.setBorder(new EmptyBorder(5, 0, 0, 0));
initInitialIconConfigPane(); initInitialIconConfigPane();
initSelectedIconConfigPane(); initSelectedIconConfigPane();
JPanel container = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5); JPanel container = FRGUIPaneFactory.createVerticalFlowLayout_Pane(true, FlowLayout.LEADING, 0, 5);
JPanel initialPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel initialPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
initialPane.add(initialLabel); initialPane.add(initialLabel, BorderLayout.WEST);
initialPane.add(initialIconConfigPane); initialPane.add(initialIconConfigPane, BorderLayout.CENTER);
container.add(initialPane); container.add(initialPane);
JPanel selectedPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel selectedPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
selectedPane.add(selectedLabel); selectedPane.add(selectedLabel, BorderLayout.WEST);
selectedPane.add(selectedIconConfigPane); selectedPane.add(selectedIconConfigPane, BorderLayout.CENTER);
container.add(selectedPane); container.add(selectedPane);
centerPane.add(container); centerPane.add(container);

Loading…
Cancel
Save