|
|
|
@ -67,19 +67,19 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
|
|
|
|
|
this.customBeanPane.populateBean(ob); |
|
|
|
|
|
|
|
|
|
customCombo.setSelectedIndex(ob.isCommonCustom() ? 1 : 0); |
|
|
|
|
if(ob.getBackground() != null) { |
|
|
|
|
colorSelectBox.setSelectObject(((ColorBackground)ob.getBackground()).getColor()); |
|
|
|
|
if(ob.getCommonBackground() != null) { |
|
|
|
|
colorSelectBox.setSelectObject(((ColorBackground)ob.getCommonBackground()).getColor()); |
|
|
|
|
} |
|
|
|
|
borderType.setSelectedLineStyle(ob.getBorderType()); |
|
|
|
|
if (ob.getBorderColor() != null) { |
|
|
|
|
borderColor.setSelectObject(ob.getBorderColor()); |
|
|
|
|
borderType.setSelectedLineStyle(ob.getCommonBorderType()); |
|
|
|
|
if (ob.getCommonBorderColor() != null) { |
|
|
|
|
borderColor.setSelectObject(ob.getCommonBorderColor()); |
|
|
|
|
} |
|
|
|
|
borderRadius.setValue(ob.getBorderRadius()); |
|
|
|
|
if (ob.getIconColor() != null) { |
|
|
|
|
iconColor.setSelectObject(ob.getIconColor()); |
|
|
|
|
borderRadius.setValue(ob.getCommonBorderRadius()); |
|
|
|
|
if (ob.getCommonIconColor() != null) { |
|
|
|
|
iconColor.setSelectObject(ob.getCommonIconColor()); |
|
|
|
|
} |
|
|
|
|
if (ob.getFont() != null) { |
|
|
|
|
fontConfigPane.populateBean(ob.getFont()); |
|
|
|
|
if (ob.getCommonFont() != null) { |
|
|
|
|
fontConfigPane.populateBean(ob.getCommonFont()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -89,12 +89,12 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
|
|
|
|
|
this.widget.setMobileStyle(mobileStyle); |
|
|
|
|
this.customBeanPane.updateBean(); |
|
|
|
|
mobileStyle.setCommonCustom(customCombo.getSelectedIndex() == 1); |
|
|
|
|
mobileStyle.setBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject())); |
|
|
|
|
mobileStyle.setBorderType(borderType.getSelectedLineStyle()); |
|
|
|
|
mobileStyle.setBorderColor(borderColor.getSelectObject()); |
|
|
|
|
mobileStyle.setBorderRadius(borderRadius.getValue()); |
|
|
|
|
mobileStyle.setIconColor(iconColor.getSelectObject()); |
|
|
|
|
mobileStyle.setFont(fontConfigPane.updateBean()); |
|
|
|
|
mobileStyle.setCommonBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject())); |
|
|
|
|
mobileStyle.setCommonBorderType(borderType.getSelectedLineStyle()); |
|
|
|
|
mobileStyle.setCommonBorderColor(borderColor.getSelectObject()); |
|
|
|
|
mobileStyle.setCommonBorderRadius(borderRadius.getValue()); |
|
|
|
|
mobileStyle.setCommonIconColor(iconColor.getSelectObject()); |
|
|
|
|
mobileStyle.setCommonFont(fontConfigPane.updateBean()); |
|
|
|
|
return mobileStyle; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|