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.cpp;h=7875e5c6ae97d2713a759463595d5fedb615bac5;hp=258fea7b00edf555e1b9c7465a31d5f053b02de0;hb=7b08f72b7f2a1b7467f9e3fd814fb415ecbc9657;hpb=27fd5cb5cb2d9db86d3e083e6361dde536b010f3 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 258fea7..7875e5c 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1757,14 +1757,14 @@ Vector3 Controller::GetNaturalSize() mImpl->UpdateModel( onlyOnceOperations ); // Layout the text for the new width. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | REORDER ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); // Store the actual control's size to restore later. const Size actualControlSize = mImpl->mModel->mVisualModel->mControlSize; DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), static_cast( onlyOnceOperations | - LAYOUT | REORDER ), + LAYOUT ), naturalSize.GetVectorXY() ); // Do not do again the only once operations. @@ -3694,11 +3694,6 @@ void Controller::ResetScrollPosition() } } -void Controller::SetControlInterface( ControlInterface* controlInterface ) -{ - mImpl->mControlInterface = controlInterface; -} - bool Controller::ShouldClearFocusOnEscape() const { return mImpl->mShouldClearFocusOnEscape;