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.h;h=c0ab806a13883e8fb8a595d05da3114ab649cff3;hp=1b586b2b0b3aa6ad3c21785dd8c5c119449051a2;hb=3b40841fc89a35e96fbf677f2b8c0c5042513aeb;hpb=6ea2f17f49c9c694a24d951160a7389c844d7889 diff --git a/dali-toolkit/internal/text/text-controller-relayouter.h b/dali-toolkit/internal/text/text-controller-relayouter.h index 1b586b2..c0ab806 100644 --- a/dali-toolkit/internal/text/text-controller-relayouter.h +++ b/dali-toolkit/internal/text/text-controller-relayouter.h @@ -85,13 +85,14 @@ struct Controller::Relayouter /** * @brief Called by the Controller to do certain operations when relayouting. * - * @param[in] controller A reference to the controller class + * @param[in] impl A reference to the controller impl class * @param[in] size The size to set * @param[in] operationsRequired The operations we need to do * @param[in/out] layoutSize The Layout size which can be updated depending on the result of the performed operations * @return */ - static bool DoRelayout(Controller& controller, const Size& size, OperationsMask operationsRequired, Size& layoutSize); + + static bool DoRelayout(Controller::Impl& impl, const Size& size, OperationsMask operationsRequired, Size& layoutSize); /** * @brief Called by the Controller to calculate the veritcal offset give the control size. @@ -109,12 +110,22 @@ struct Controller::Relayouter * @param[in] controller The controller to calcualte size on it. * @param[in] requestedControllerSize The requested size of controller to calcualte layout size on it. * @param[in] requestedOperationsMask The requested operations-mask to calcualte layout size according to it. - * @param[in] restoreLinesAndGlyphPositions whether to restore lines and glyph-positions to status before requesting calculation on size. * * @return The calculated layout-size. */ - static Size CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask, bool restoreLinesAndGlyphPositions); + static Size CalculateLayoutSizeOnRequiredControllerSize(Controller& controller, const Size& requestedControllerSize, const OperationsMask& requestedOperationsMask); + +private: + /** + * @brief Called by the DoRelayout to do HorizontalAlignment operation when relayouting. + * + * @param[in] impl A reference to the controller impl class + * @param[in] size The size to set + * @param[in] startIndex The start index for relayouting + * @param[in] requestedNumberOfCharacters The number Of characters for relayouting + */ + static void DoRelayoutHorizontalAlignment(Controller::Impl& impl, const Size& size, const CharacterIndex startIndex, const Length requestedNumberOfCharacters); }; } // namespace Text