X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fcontroller%2Ftext-controller-input-font-handler.cpp;h=39ecad17ba9bf2b84e4ccb5c4b3975ccdc2a0b07;hb=HEAD;hp=a1e6214bf15ca906c3139700505765f6e317360b;hpb=27d173933230d0cdb85da537a2c818fb85afed59;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
index a1e6214..39ecad1 100644
--- a/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
+++ b/dali-toolkit/internal/text/controller/text-controller-input-font-handler.cpp
@@ -131,7 +131,7 @@ void Controller::InputFontHandler::SetInputFontFamily(Controller& controller, co
   }
 }
 
-const std::string& Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
+std::string Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
 {
   if(NULL != controller.mImpl->mEventData)
   {
@@ -373,7 +373,7 @@ FontSlant Controller::InputFontHandler::GetInputFontSlant(const Controller& cont
   return controller.GetDefaultFontSlant();
 }
 
-void Controller::InputFontHandler::SetInputFontPointSize(Controller& controller, float size)
+void Controller::InputFontHandler::SetInputFontPointSize(Controller& controller, float size, bool defaultFontSizeUpdated)
 {
   if(NULL != controller.mImpl->mEventData)
   {
@@ -385,7 +385,7 @@ void Controller::InputFontHandler::SetInputFontPointSize(Controller& controller,
       CharacterIndex startOfSelectedText  = 0u;
       Length         lengthOfSelectedText = 0u;
 
-      if(EventData::SELECTING == controller.mImpl->mEventData->mState)
+      if(EventData::SELECTING == controller.mImpl->mEventData->mState && !defaultFontSizeUpdated)
       {
         // Update a font description run for the selecting state.
         FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun(controller.mImpl->mEventData,