From: keonpyo.kong <keonpyo.kong@samsung.com>
Date: Fri, 22 Mar 2013 11:52:57 +0000 (+0900)
Subject: Bug fix in  GetfallbackFont , check same style font
X-Git-Tag: accepted/tizen_2.1/20130425.033138~767^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=598e1a45e213f77da23d2ed291bccb29c2402965;p=platform%2Fframework%2Fnative%2Fuifw.git

Bug fix in  GetfallbackFont , check same style font

Change-Id: I49aabb3daae84e928165c36dd9b352e03f91ae06
Signed-off-by: keonpyo.kong <keonpyo.kong@samsung.com>
---

diff --git a/src/ui/FUi_Control.cpp b/src/ui/FUi_Control.cpp
index 9430e2f..13cf641 100644
--- a/src/ui/FUi_Control.cpp
+++ b/src/ui/FUi_Control.cpp
@@ -2470,10 +2470,11 @@ _Control::GetFallbackFont(void)
 	delegate.OnFontInfoRequested(style, textSize);
 	delegate.OnFontInfoRequested(style, floatTextSize);
 	_ControlManager* pControlManager = _ControlManager::GetInstance();
-
+	_FontImpl* pFontImpl  = _FontImpl::GetInstance(*__pFont);
 	if (!(__isControlFontChanged || pControlManager->IsDefaultFontChanged())
 		&& __pFont != null
-		&& ((__pFont->GetSize() == textSize || __pFont->GetSizeF() == floatTextSize)))
+		&& ((__pFont->GetSize() == textSize || __pFont->GetSizeF() == floatTextSize))
+		&& (pFontImpl->GetStyle() == style))
 	{
 		return __pFont;
 	}