From 22765d3fe6649b1eb812ac2dd94277859d7e8e48 Mon Sep 17 00:00:00 2001 From: WeiYanglu Date: Wed, 28 Aug 2019 23:56:51 +0800 Subject: [PATCH] =?UTF-8?q?MOBILE-21673=20&=20MOBILE-21669=20=E6=8A=8A?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E6=94=B9=E4=B8=BABackgroud=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6tilteBorder=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=A7=86=E8=A7=89=E8=A6=81=E6=B1=82=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/ui/MobileStyleDefinePane.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java index 82e189943..1ec8fe5e5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.mobile.ui; +import com.fr.base.background.ColorBackground; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; @@ -23,6 +24,7 @@ public class MobileStyleDefinePane extends BasicBeanPane { private MobileStyleCustomDefinePane customBeanPane; private Class mobileStyleClazz; private NewColorSelectBox colorSelectBox; + private Color titleColor = new Color(47, 142, 241); MobileStyleDefinePane(Widget widget, Class customBeanPaneClass, Class mobileStyleClazz) { @@ -35,7 +37,9 @@ public class MobileStyleDefinePane extends BasicBeanPane { @Override public void populateBean(MobileStyle ob) { this.customBeanPane.populateBean(ob); - colorSelectBox.setSelectObject(ob.getBackground()); + if(ob.getBackground() != null) { + colorSelectBox.setSelectObject(((ColorBackground)ob.getBackground()).getColor()); + } } @Override @@ -43,7 +47,7 @@ public class MobileStyleDefinePane extends BasicBeanPane { MobileStyle mobileStyle = Reflect.on(mobileStyleClazz).create().get(); this.widget.setMobileStyle(mobileStyle); this.customBeanPane.updateBean(); - mobileStyle.setBackground(colorSelectBox.getSelectObject()); + mobileStyle.setBackground(ColorBackground.getInstance(colorSelectBox.getSelectObject())); return mobileStyle; } @@ -67,8 +71,7 @@ public class MobileStyleDefinePane extends BasicBeanPane { JPanel mobileStylePreviewPane = this.customBeanPane.createPreviewPane(); if(mobileStylePreviewPane != null) { JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview"), null); - titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, new Color(0x2f8ef100))); + TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Widget_Style_Preview")); previewPane.setBorder(titledBorder); previewPane.setPreferredSize(new Dimension(500, 83)); previewPane.add(mobileStylePreviewPane, BorderLayout.CENTER); @@ -82,8 +85,7 @@ public class MobileStyleDefinePane extends BasicBeanPane { backgroundPane.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 5)); backgroundPane.setPreferredSize(new Dimension(500, 65)); - TitledBorder titledBorder = GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_Common_Attribute"), null); - titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, Color.BLUE)); + TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Mobile_Common_Attribute")); backgroundPane.setBorder(titledBorder); UILabel colorSelectLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Widget_Background"), UILabel.RIGHT); @@ -104,12 +106,17 @@ public class MobileStyleDefinePane extends BasicBeanPane { private void createCustomPane() { JPanel configPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - TitledBorder titledBorder = GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set"), null); - titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12, Color.BLUE)); + TitledBorder titledBorder = createTitledBorder(Toolkit.i18nText("Fine-Design_Report_Set")); configPane.setBorder(titledBorder); configPane.add(this.customBeanPane, BorderLayout.CENTER); this.add(configPane, BorderLayout.CENTER); } + + private TitledBorder createTitledBorder(String title) { + TitledBorder titledBorder = GUICoreUtils.createTitledBorder(title, titleColor); + titledBorder.setTitleFont(FRFont.getInstance("PingFangSC-Regular", Font.PLAIN, 12)); + return titledBorder; + } }