}
}
-const std::string& Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
+std::string Controller::InputFontHandler::GetInputFontFamily(const Controller& controller)
{
if(NULL != controller.mImpl->mEventData)
{
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)
{
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,