X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-model.h;h=4256421efbd4c965790334408073c8cf63d85186;hb=97f8d1fe9947ec36ab2aea880adc3d78f5653a9b;hp=765dd317069ae58019719617f90078daf9baa318;hpb=534e542d7dcc1a1507a0e5e6845d49c06a15d326;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h index 765dd31..4256421 100644 --- a/dali-toolkit/internal/text/text-model.h +++ b/dali-toolkit/internal/text/text-model.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_MODEL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -23,6 +23,7 @@ // INTERNAL INCLUDES #include +#include #include #include #include @@ -156,8 +157,11 @@ public: * Typically this will have a negative value with scrolling occurs. */ Vector2 mScrollPosition; ///< The text is offset by this position when scrolling. + Vector2 mScrollPositionLast; ///< The last offset value of mScrollPosition Layout::HorizontalAlignment mHorizontalAlignment; ///< The layout's horizontal alignment. Layout::VerticalAlignment mVerticalAlignment; ///< The layout's vertical alignment. + Layout::LineWrap::Mode mLineWrapMode; ///< The text wrap mode + float mAlignmentOffset; ///< The alignment offset. bool mElideEnabled:1; ///< Whether the text's elide is enabled. };