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=527bb9962ac2b81cad3843c08b6c7e094e0b1b08;hp=d04483a923157d6b5f7491b84a7ffb421a71a342;hb=6971d8bc50e36b3b7d62ad07355b41d3fe41af58;hpb=79c48ed0f1dc5f7fbcc0f8ea5c5e1b1fd297b42d diff --git a/dali-toolkit/internal/text/text-controller-relayouter.cpp b/dali-toolkit/internal/text/text-controller-relayouter.cpp index d04483a..527bb99 100644 --- a/dali-toolkit/internal/text/text-controller-relayouter.cpp +++ b/dali-toolkit/internal/text/text-controller-relayouter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include namespace @@ -48,7 +49,7 @@ namespace Toolkit { namespace Text { -Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask, bool restoreLinesAndGlyphPositions) +Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask) { DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->CalculateLayoutSizeOnRequiredControllerSize\n"); Size calculatedLayoutSize; @@ -57,17 +58,6 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control ModelPtr& model = impl.mModel; VisualModelPtr& visualModel = model->mVisualModel; - // Store the pending operations mask so that it can be restored later on with no modifications made on it - // while getting the natural size were reflected on the original mask. - OperationsMask operationsPendingBackUp = static_cast(impl.mOperationsPending); - - // This is a hotfix for side effect on Scrolling, LineWrap and Invalid position of cursor in TextEditor after calling CalculateLayoutSizeOnRequiredControllerSize. - // The number of lines and glyph-positions inside visualModel have been changed by calling DoRelayout with requestedControllerSize. - // Store the mLines and mGlyphPositions from visualModel so that they can be restored later on with no modifications made on them. - //TODO: Refactor "DoRelayout" and extract common code of size calculation without modifying attributes of mVisualModel, and then blah, blah, etc. - Vector linesBackup = visualModel->mLines; - Vector glyphPositionsBackup = visualModel->mGlyphPositions; - // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | GET_SCRIPTS | @@ -77,45 +67,89 @@ Size Controller::Relayouter::CalculateLayoutSizeOnRequiredControllerSize(Control SHAPE_TEXT | GET_GLYPH_METRICS); + const OperationsMask sizeOperations = static_cast(LAYOUT | ALIGN | REORDER); + // 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(); - // Make sure the model is up-to-date before layouting - impl.UpdateModel(onlyOnceOperations); - // Get a reference to the pending operations member OperationsMask& operationsPending = impl.mOperationsPending; - // Layout the text for the new width. - operationsPending = static_cast(operationsPending | requestedOperationsMask); - // Store the actual control's size to restore later. const Size actualControlSize = visualModel->mControlSize; - DoRelayout(controller, - requestedControllerSize, - static_cast(onlyOnceOperations | - requestedOperationsMask), - calculatedLayoutSize); + // Whether the text control is editable + const bool isEditable = NULL != impl.mEventData; - // Clear the update info. This info will be set the next time the text is updated. - textUpdateInfo.Clear(); - textUpdateInfo.mClearAll = true; + if(!isEditable) + { + impl.UpdateModel(onlyOnceOperations); - // Restore the actual control's size. - visualModel->mControlSize = actualControlSize; - // Restore the previously backed-up pending operations' mask without the only once operations. - impl.mOperationsPending = static_cast(operationsPendingBackUp & ~onlyOnceOperations); + // Layout the text for the new width. + operationsPending = static_cast(operationsPending | requestedOperationsMask); + + DoRelayout(impl, + requestedControllerSize, + static_cast(onlyOnceOperations | requestedOperationsMask), + calculatedLayoutSize); - // Restore the previously backed-up mLines and mGlyphPositions from visualModel. - if(restoreLinesAndGlyphPositions) + textUpdateInfo.Clear(); + textUpdateInfo.mClearAll = true; + + // Do not do again the only once operations. + operationsPending = static_cast(operationsPending & ~onlyOnceOperations); + } + else { - visualModel->mLines = linesBackup; - visualModel->mGlyphPositions = glyphPositionsBackup; + // This is to keep Index to the first character to be updated. + // Then restore it after calling Clear method. + auto updateInfoCharIndexBackup = textUpdateInfo.mCharacterIndex; + + // Layout the text for the new width. + // Apply the pending operations, requested operations and the only once operations. + // Then remove onlyOnceOperations + operationsPending = static_cast(operationsPending | requestedOperationsMask | onlyOnceOperations); + + // Make sure the model is up-to-date before layouting + impl.UpdateModel(static_cast(operationsPending & ~UPDATE_LAYOUT_SIZE)); + + DoRelayout(impl, + requestedControllerSize, + static_cast(operationsPending & ~UPDATE_LAYOUT_SIZE), + calculatedLayoutSize); + + // Clear the update info. This info will be set the next time the text is updated. + textUpdateInfo.Clear(); + + //TODO: Refactor "DoRelayout" and extract common code of size calculation without modifying attributes of mVisualModel, + //TODO: then calculate GlyphPositions. Lines, Size, Layout for Natural-Size + //TODO: and utilize the values in OperationsPending and TextUpdateInfo without changing the original one. + //TODO: Also it will improve performance because there is no need todo FullRelyout on the next need for layouting. + + // FullRelayoutNeeded should be true because DoRelayout is MAX_FLOAT, MAX_FLOAT. + // By this no need to take backup and restore it. + textUpdateInfo.mFullRelayoutNeeded = true; + + // Restore mCharacterIndex. Because "Clear" set it to the maximum integer. + // The "CalculateTextUpdateIndices" does not work proprely because the mCharacterIndex will be greater than mPreviousNumberOfCharacters. + // Which apply an assumption to update only the last paragraph. That could cause many of out of index crashes. + textUpdateInfo.mCharacterIndex = updateInfoCharIndexBackup; } + // Do the size related operations again. + operationsPending = static_cast(operationsPending | sizeOperations); + + // Restore the actual control's size. + visualModel->mControlSize = actualControlSize; + return calculatedLayoutSize; } @@ -125,7 +159,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; @@ -139,7 +173,7 @@ Vector3 Controller::Relayouter::GetNaturalSize(Controller& controller) OperationsMask requestedOperationsMask = static_cast(LAYOUT | REORDER); Size sizeMaxWidthAndMaxHeight = Size(MAX_FLOAT, MAX_FLOAT); - naturalSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeMaxWidthAndMaxHeight, requestedOperationsMask, true); + naturalSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeMaxWidthAndMaxHeight, requestedOperationsMask); // Stores the natural size to avoid recalculate it again // unless the text/style changes. @@ -187,7 +221,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 +246,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,7 +289,11 @@ 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; impl.ClearFontData(); @@ -266,7 +305,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; @@ -283,15 +322,7 @@ float Controller::Relayouter::GetHeightForWidth(Controller& controller, float wi OperationsMask requestedOperationsMask = static_cast(LAYOUT); Size sizeRequestedWidthAndMaxHeight = Size(width, MAX_FLOAT); - // Skip restore, because if GetHeightForWidth called before rendering and layouting then visualModel->mControlSize will be zero which will make LineCount zero. - // The implementation of Get LineCount property depends on calling GetHeightForWidth then read mLines.Count() from visualModel direct. - // If the LineCount property is requested before rendering and layouting then the value will be zero, which is incorrect. - // So we will not restore the previously backed-up mLines and mGlyphPositions from visualModel in such case. - // Another case to skip restore is when the requested width equals the Control's width which means the caller need to update the old values. - // For example, when the text is changed. - bool restoreLinesAndGlyphPositions = (visualModel->mControlSize.width > 0 && visualModel->mControlSize.height > 0) && (visualModel->mControlSize.width != width); - - layoutSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeRequestedWidthAndMaxHeight, requestedOperationsMask, restoreLinesAndGlyphPositions); + layoutSize = CalculateLayoutSizeOnRequiredControllerSize(controller, sizeRequestedWidthAndMaxHeight, requestedOperationsMask); DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height); } @@ -384,8 +415,11 @@ Controller::UpdateTextType Controller::Relayouter::Relayout(Controller& controll textUpdateInfo.mCharacterIndex = 0u; } + bool layoutDirectionChanged = false; if(impl.mLayoutDirection != layoutDirection) { + // Flag to indicate that the layout direction has changed. + layoutDirectionChanged = true; // Clear the update info. This info will be set the next time the text is updated. textUpdateInfo.mClearAll = true; // Apply modifications to the model @@ -402,12 +436,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,18 +465,42 @@ 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(impl, size); + } + else // TextEditor + { + // If layoutSize is bigger than size, vertical align has no meaning. + if(layoutSize.y < size.y) + { + CalculateVerticalOffset(impl, size); + if(impl.mEventData) + { + impl.mEventData->mScrollAfterDelete = false; + } + } } if(isEditable) { - if(newSize) + if(newSize || layoutDirectionChanged) { - // If there is a new size, the scroll position needs to be clamped. + // If there is a new size or layout direction is changed, the scroll position needs to be clamped. impl.ClampHorizontalScroll(layoutSize); // Update the decorator's positions is needed if there is a new size. impl.mEventData->mDecorator->UpdatePositions(model->mScrollPosition - offset); + + // All decorator elements need to be updated. + if(EventData::IsEditingState(impl.mEventData->mState)) + { + impl.mEventData->mScrollAfterUpdatePosition = true; + impl.mEventData->mUpdateCursorPosition = true; + impl.mEventData->mUpdateGrabHandlePosition = true; + } + else if(impl.mEventData->mState == EventData::SELECTING) + { + impl.mEventData->mUpdateHighlightBox = true; + } } // Move the cursor, grab handle etc. @@ -459,13 +517,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 +556,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()); @@ -566,12 +622,15 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size } // Update the visual model. - bool isAutoScrollEnabled = impl.mIsAutoScrollEnabled; + bool isAutoScrollEnabled = impl.mIsAutoScrollEnabled; + bool isAutoScrollMaxTextureExceeded = impl.mIsAutoScrollMaxTextureExceeded; + Size newLayoutSize; viewUpdated = impl.mLayoutEngine.LayoutText(layoutParameters, newLayoutSize, elideTextEnabled, isAutoScrollEnabled, + isAutoScrollMaxTextureExceeded, ellipsisPosition); impl.mIsAutoScrollEnabled = isAutoScrollEnabled; @@ -601,21 +660,51 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size if(NO_OPERATION != (ALIGN & operations)) { - // The laid-out lines. - Vector& lines = visualModel->mLines; + DoRelayoutHorizontalAlignment(impl, size, startIndex, requestedNumberOfCharacters); + viewUpdated = true; + } +#if defined(DEBUG_ENABLED) + std::string currentText; + 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::Relayouter::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); + return viewUpdated; +} - CharacterIndex alignStartIndex = startIndex; - Length alignRequestedNumberOfCharacters = requestedNumberOfCharacters; +void Controller::Relayouter::DoRelayoutHorizontalAlignment(Controller::Impl& impl, + const Size& size, + const CharacterIndex startIndex, + const Length requestedNumberOfCharacters) +{ + // The visualModel + VisualModelPtr& visualModel = impl.mModel->mVisualModel; - // the whole text needs to be full aligned. - // If you do not do a full aligned, only the last line of the multiline input is aligned. - if(impl.mEventData && impl.mEventData->mUpdateAlignment) - { - alignStartIndex = 0u; - alignRequestedNumberOfCharacters = impl.mModel->mLogicalModel->mText.Count(); - impl.mEventData->mUpdateAlignment = false; - } + // The laid-out lines. + Vector& lines = visualModel->mLines; + CharacterIndex alignStartIndex = startIndex; + Length alignRequestedNumberOfCharacters = requestedNumberOfCharacters; + + // the whole text needs to be full aligned. + // If you do not do a full aligned, only the last line of the multiline input is aligned. + if(impl.mEventData && impl.mEventData->mUpdateAlignment) + { + alignStartIndex = 0u; + alignRequestedNumberOfCharacters = impl.mModel->mLogicalModel->mText.Count(); + impl.mEventData->mUpdateAlignment = false; + } + + // If there is no BoundedParagraphRuns then apply the alignment of controller. + // Check whether the layout is single line. It's needed to apply one alignment for single-line. + // In single-line layout case we need to check whether to follow the alignment of controller or the first BoundedParagraph. + // Apply BoundedParagraph's alignment if and only if there is one BoundedParagraph contains all characters. Otherwise follow controller's alignment. + const bool isFollowControllerAlignment = ((impl.mModel->GetNumberOfBoundedParagraphRuns() == 0u) || + ((Layout::Engine::SINGLE_LINE_BOX == impl.mLayoutEngine.GetLayout()) && + (impl.mModel->GetBoundedParagraphRuns()[0].characterRun.numberOfCharacters != impl.mModel->mLogicalModel->mText.Count()))); + + if(isFollowControllerAlignment) + { // Need to align with the control's size as the text may contain lines // starting either with left to right text or right to left. impl.mLayoutEngine.Align(size, @@ -626,28 +715,102 @@ bool Controller::Relayouter::DoRelayout(Controller& controller, const Size& size impl.mModel->mAlignmentOffset, impl.mLayoutDirection, (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)); + } + else + { + //Override the controller horizontal-alignment by horizontal-alignment of bounded paragraph. + const Length& numberOfBoundedParagraphRuns = impl.mModel->GetNumberOfBoundedParagraphRuns(); + const Vector& boundedParagraphRuns = impl.mModel->GetBoundedParagraphRuns(); + const CharacterIndex alignEndIndex = alignStartIndex + alignRequestedNumberOfCharacters - 1u; - viewUpdated = true; + Length alignIndex = alignStartIndex; + Length boundedParagraphRunIndex = 0u; + + while(alignIndex <= alignEndIndex && boundedParagraphRunIndex < numberOfBoundedParagraphRuns) + { + //BP: BoundedParagraph + const BoundedParagraphRun& boundedParagraphRun = boundedParagraphRuns[boundedParagraphRunIndex]; + const CharacterIndex& characterStartIndexBP = boundedParagraphRun.characterRun.characterIndex; + const Length& numberOfCharactersBP = boundedParagraphRun.characterRun.numberOfCharacters; + const CharacterIndex characterEndIndexBP = characterStartIndexBP + numberOfCharactersBP - 1u; + + CharacterIndex decidedAlignStartIndex = alignIndex; + Length decidedAlignNumberOfCharacters = alignEndIndex - alignIndex + 1u; + Text::HorizontalAlignment::Type decidedHorizontalAlignment = impl.mModel->mHorizontalAlignment; + + /* + * Shortcuts to explain indexes cases: + * + * AS: Alignment Start Index + * AE: Alignment End Index + * PS: Paragraph Start Index + * PE: Paragraph End Index + * B: BoundedParagraph Alignment + * M: Model Alignment + * + */ + + if(alignIndex < characterStartIndexBP && characterStartIndexBP <= alignEndIndex) /// AS.MMMMMM.PS--------AE + { + // Alignment from "Alignment Start Index" to index before "Paragraph Start Index" according to "Model Alignment" + decidedAlignStartIndex = alignIndex; + decidedAlignNumberOfCharacters = characterStartIndexBP - alignIndex; + decidedHorizontalAlignment = impl.mModel->mHorizontalAlignment; + + // Need to re-heck the case of current bounded paragraph + alignIndex = characterStartIndexBP; // Shift AS to be PS + } + else if((characterStartIndexBP <= alignIndex && alignIndex <= characterEndIndexBP) || /// ---PS.BBBBBBB.AS.BBBBBBB.PE--- + (characterStartIndexBP <= alignEndIndex && alignEndIndex <= characterEndIndexBP)) /// ---PS.BBBBBB.AE.BBBBBBB.PE--- + { + // Alignment from "Paragraph Start Index" to "Paragraph End Index" according to "BoundedParagraph Alignment" + decidedAlignStartIndex = characterStartIndexBP; + decidedAlignNumberOfCharacters = numberOfCharactersBP; + decidedHorizontalAlignment = boundedParagraphRun.horizontalAlignmentDefined ? boundedParagraphRun.horizontalAlignment : impl.mModel->mHorizontalAlignment; + + alignIndex = characterEndIndexBP + 1u; // Shift AS to be after PE direct + boundedParagraphRunIndex++; // Align then check the case of next bounded paragraph + } + else + { + boundedParagraphRunIndex++; // Check the case of next bounded paragraph + continue; + } + + impl.mLayoutEngine.Align(size, + decidedAlignStartIndex, + decidedAlignNumberOfCharacters, + decidedHorizontalAlignment, + lines, + impl.mModel->mAlignmentOffset, + impl.mLayoutDirection, + (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)); + } + + //Align the remaining that is not aligned + if(alignIndex <= alignEndIndex) + { + impl.mLayoutEngine.Align(size, + alignIndex, + (alignEndIndex - alignIndex + 1u), + impl.mModel->mHorizontalAlignment, + lines, + impl.mModel->mAlignmentOffset, + impl.mLayoutDirection, + (impl.mModel->mMatchLayoutDirection != DevelText::MatchLayoutDirection::CONTENTS)); + } } -#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()); -#endif - DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); - return viewUpdated; } -void Controller::Relayouter::CalculateVerticalOffset(Controller& controller, const Size& controlSize) +void Controller::Relayouter::CalculateVerticalOffset(Controller::Impl& impl, const Size& controlSize) { - Controller::Impl& impl = *controller.mImpl; - ModelPtr& model = impl.mModel; - VisualModelPtr& visualModel = model->mVisualModel; - Size layoutSize = model->mVisualModel->GetLayoutSize(); - Size oldLayoutSize = layoutSize; - float offsetY = 0.f; - bool needRecalc = false; - float defaultFontLineHeight = impl.GetDefaultFontLineHeight(); + ModelPtr& model = impl.mModel; + VisualModelPtr& visualModel = model->mVisualModel; + Size layoutSize = model->mVisualModel->GetLayoutSize(); + Size oldLayoutSize = layoutSize; + float offsetY = 0.f; + bool needRecalc = false; + float defaultFontLineHeight = impl.GetDefaultFontLineHeight(); if(fabsf(layoutSize.height) < Math::MACHINE_EPSILON_1000) {