X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-relayouter.cpp;h=ce40c6073bbeab190512ebeebf4794a483fc1873;hp=4c71934620847d639698c4ceb100196f80df1d6d;hb=43255aba62db53f6a8f042687687141fb9de8aa1;hpb=2d59f0b716ea7f7c06de0732d3e4e78aea127de6 diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp index 4c71934..ce40c60 100644 --- a/dali-toolkit/internal/text/text-controller-relayouter.cpp +++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include namespace @@ -78,7 +79,13 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control GET_GLYPH_METRICS); // Set the update info to relayout the whole text. - TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo; + TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo; + if((0 == textUpdateInfo.mNumberOfCharactersToAdd) && + (0 == textUpdateInfo.mPreviousNumberOfCharacters) && + ((visualModel->mControlSize.width < Math::MACHINE_EPSILON_1000) || (visualModel->mControlSize.height < Math::MACHINE_EPSILON_1000))) + { + textUpdateInfo.mNumberOfCharactersToAdd = model->mLogicalModel->mText.Count(); + } textUpdateInfo.mParagraphCharacterIndex = 0u; textUpdateInfo.mRequestedNumberOfCharacters = model->mLogicalModel->mText.Count(); @@ -94,7 +101,7 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control // Store the actual control's size to restore later. const Size actualControlSize = visualModel->mControlSize; - DoRelayout(controller, + DoRelayout(impl, requestedControllerSize, static_cast(onlyOnceOperations | requestedOperationsMask), @@ -125,7 +132,7 @@ Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller) Vector3 naturalSizeVec3; // Make sure the model is up-to-date before layouting - controller.ProcessModifyEvents(); + EventHandler::ProcessModifyEvents(controller); Controller::Impl& impl = *controller.mImpl; ModelPtr& model = impl.mModel; @@ -170,7 +177,7 @@ bool Controller::Relayouter::CheckForTextFit(Controller& controller, float point TextUpdateInfo& textUpdateInfo = impl.mTextUpdateInfo; impl.mFontDefaults->mFitPointSize = pointSize; impl.mFontDefaults->sizeDefined = true; - controller.ClearFontData(); + impl.ClearFontData(); // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | @@ -187,7 +194,7 @@ bool Controller::Relayouter::CheckForTextFit(Controller& controller, float point // Make sure the model is up-to-date before layouting impl.UpdateModel(onlyOnceOperations); - DoRelayout(controller, + DoRelayout(impl, Size(layoutSize.width, MAX_FLOAT), static_cast(onlyOnceOperations | LAYOUT), textSize); @@ -212,10 +219,11 @@ void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const { ModelPtr& model = impl.mModel; - bool actualellipsis = model->mElideEnabled; - float minPointSize = impl.mTextFitMinSize; - float maxPointSize = impl.mTextFitMaxSize; - float pointInterval = impl.mTextFitStepSize; + bool actualellipsis = model->mElideEnabled; + float minPointSize = impl.mTextFitMinSize; + float maxPointSize = impl.mTextFitMaxSize; + float pointInterval = impl.mTextFitStepSize; + float currentFitPointSize = impl.mFontDefaults->mFitPointSize; model->mElideEnabled = false; Vector pointSizeArray; @@ -254,10 +262,14 @@ void Controller::Relayouter::FitPointSizeforLayout(Controller& controller, const } } - model->mElideEnabled = actualellipsis; + model->mElideEnabled = actualellipsis; + if(currentFitPointSize != pointSizeArray[bestSizeIndex]) + { + impl.mTextFitChanged = true; + } impl.mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex]; impl.mFontDefaults->sizeDefined = true; - controller.ClearFontData(); + impl.ClearFontData(); } } @@ -266,7 +278,7 @@ float Controller::Relayouter::GetHeightForWidth(Controller& controller, float wi DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", &controller, width); // Make sure the model is up-to-date before layouting - controller.ProcessModifyEvents(); + EventHandler::ProcessModifyEvents(controller); Controller::Impl& impl = *controller.mImpl; ModelPtr& model = impl.mModel; @@ -402,12 +414,12 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll } // Make sure the model is up-to-date before layouting. - controller.ProcessModifyEvents(); + EventHandler::ProcessModifyEvents(controller); bool updated = impl.UpdateModel(operationsPending); // Layout the text. Size layoutSize; - updated = DoRelayout(controller, size, operationsPending, layoutSize) || updated; + updated = DoRelayout(impl, size, operationsPending, layoutSize) || updated; if(updated) { @@ -431,7 +443,7 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll if(!isEditable || !controller.IsMultiLineEnabled()) { // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated. - controller.CalculateVerticalOffset(size); + CalculateVerticalOffset(controller, size); } if(isEditable) @@ -459,13 +471,11 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll return updateTextType; } -bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size, OperationsMask operationsRequired, Size& layoutSize) +bool Controller::Relayouter::DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize) { - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", &controller, size.width, size.height); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayouter::DoRelayout %p size %f,%f\n", &impl, size.width, size.height); bool viewUpdated(false); - Controller::Impl& impl = *controller.mImpl; - // Calculate the operations to be done. const OperationsMask operations = static_cast(impl.mOperationsPending & operationsRequired); @@ -500,7 +510,7 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size (lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u)) { std::string currentText; - controller.GetText(currentText); + impl.GetText(currentText); DALI_LOG_ERROR("Controller::DoRelayout: Attempting to access invalid buffer\n"); DALI_LOG_ERROR("Current text is: %s\n", currentText.c_str()); @@ -561,7 +571,7 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size // Reset the scroll position in inactive state if(elideTextEnabled && (impl.mEventData->mState == EventData::INACTIVE)) { - controller.ResetScrollPosition(); + impl.ResetScrollPosition(); } } @@ -631,10 +641,10 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size } #if defined(DEBUG_ENABLED) std::string currentText; - controller.GetText(currentText); - DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", &controller, (impl.mIsTextDirectionRTL) ? "true" : "false", currentText.c_str()); + impl.GetText(currentText); + DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::Relayouter::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", &impl, (impl.mIsTextDirectionRTL) ? "true" : "false", currentText.c_str()); #endif - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayouter::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); return viewUpdated; }