From 3b5c88284205dfe01a381e182fb4ba357914b846 Mon Sep 17 00:00:00 2001
From: lee <854954082@qq.com>
Date: Tue, 17 Jan 2017 12:52:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1808=20font=E7=A9=BA=E5=80=BC=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E7=BB=99=E4=BA=88=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../designer/creator/cardlayout/XCardSwitchButton.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
index 8ade2b3687..6bc1de727b 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
@@ -47,6 +47,7 @@ public class XCardSwitchButton extends XButton {
 	//设置的图片类型
 	private static final String COLORBACKGROUNDTYPE = "ColorBackground";
 	private static final String DEFAULTTYPE = "default";
+	private static final String DEFAULT_FONT_NAME = "SimSun";
 
 	//默认颜色
 	public static final Color NORMAL_GRAL = new Color(236,236,236);
@@ -65,6 +66,7 @@ public class XCardSwitchButton extends XButton {
 	private static final int FONT_SIZE_ADJUST = 2;
 
 	private static final int SIDE_OFFSET = 57;
+	private static final int FONT_SIZE = 9;
 
 	private XWCardLayout cardLayout;
 	private XWCardTagLayout tagLayout;
@@ -320,6 +322,9 @@ public class XCardSwitchButton extends XButton {
 		// 标题部分
 		WidgetTitle title = style.getTitle();
 		FRFont font = button.getFont();
+		if (font == null) {
+			font = FRFont.getInstance(DEFAULT_FONT_NAME, 0, FONT_SIZE);
+		}
 		FRFont newFont = FRFont.getInstance(font.getName(),font.getStyle(),font.getSize() + FONT_SIZE_ADJUST);
 		UILabel label = this.getContentLabel();
 		label.setFont(newFont);
@@ -398,6 +403,9 @@ public class XCardSwitchButton extends XButton {
 			XCardSwitchButton temp = (XCardSwitchButton) this.tagLayout.getComponent(i);
 			CardSwitchButton cardSwitchButton = (CardSwitchButton) temp.toData();
 			FRFont frFont = cardSwitchButton.getFont();
+			if (frFont == null) {
+				frFont = FRFont.getInstance(DEFAULT_FONT_NAME, 0, FONT_SIZE);
+			}
 			UILabel label = temp.getContentLabel();
 			label.setSize(dimension);
 			label.setFont(frFont.applyResolutionNP(ScreenResolution.getScreenResolution()));