Browse Source

Merge pull request #1385 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'f9ec69066327fb25da8472dd4a54705ba36cf795':
  MOBILE-24213 单选按钮 选项值前面会出现虚线 && 默认值
feature/big-screen
Hades 5 years ago
parent
commit
7e9feaf9eb
  1. 11
      designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java
  2. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkSettingPane.java

11
designer-base/src/main/java/com/fr/design/gui/ibutton/UIRadioButton.java

@ -25,36 +25,43 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
public UIRadioButton() { public UIRadioButton() {
super(); super();
initListener(); initListener();
initComponent();
} }
public UIRadioButton(Icon icon) { public UIRadioButton(Icon icon) {
super(icon); super(icon);
initListener(); initListener();
initComponent();
} }
public UIRadioButton(Action a) { public UIRadioButton(Action a) {
super(a); super(a);
initListener(); initListener();
initComponent();
} }
public UIRadioButton(Icon icon, boolean selected) { public UIRadioButton(Icon icon, boolean selected) {
super(icon, selected); super(icon, selected);
initListener(); initListener();
initComponent();
} }
public UIRadioButton(String text) { public UIRadioButton(String text) {
super(text); super(text);
initListener(); initListener();
initComponent();
} }
public UIRadioButton(String text, boolean selected) { public UIRadioButton(String text, boolean selected) {
super(text, selected); super(text, selected);
initListener(); initListener();
initComponent();
} }
public UIRadioButton(String text, Icon icon) { public UIRadioButton(String text, Icon icon) {
super(text, icon); super(text, icon);
initListener(); initListener();
initComponent();
} }
@ -81,6 +88,10 @@ public class UIRadioButton extends JRadioButton implements UIObserver, GlobalNam
} }
} }
private void initComponent() {
this.setFocusPainted(false);
}
/** /**
* 给组件登记一个观察者监听事件 * 给组件登记一个观察者监听事件
* *

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileBookMarkSettingPane.java

@ -39,7 +39,7 @@ public class MobileBookMarkSettingPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.mobileBookMarkStyleEditor = new AccessibleMobileBookMarkStyleEditor(new MobileBookMarkStylePane()); this.mobileBookMarkStyleEditor = new AccessibleMobileBookMarkStyleEditor(new MobileBookMarkStylePane());
this.showHierarchicalBookmarksCheck = new UICheckBox( this.showHierarchicalBookmarksCheck = new UICheckBox(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Show_BookMark")); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Show_BookMark"), true);
JPanel booKMarkPane = TableLayoutHelper.createGapTableLayoutPane( JPanel booKMarkPane = TableLayoutHelper.createGapTableLayoutPane(
new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText( new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText(
"Fine-Design_Mobile_BookMark_Style")), this.mobileBookMarkStyleEditor}}, "Fine-Design_Mobile_BookMark_Style")), this.mobileBookMarkStyleEditor}},

Loading…
Cancel
Save