X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-scroller.h;h=2d611bbd8e6257fd45b40f886931a7aa602ff8b1;hp=f6c0b87ea90544d3c6ab2633f8a066e706f85b6d;hb=003fe1b0cb2900bd60063649e46fbbbb6e7d997d;hpb=0e07671d24b10bd49423ec6ce22817000bb18336 diff --git a/dali-toolkit/internal/text/text-scroller.h b/dali-toolkit/internal/text/text-scroller.h index f6c0b87..2d611bb 100644 --- a/dali-toolkit/internal/text/text-scroller.h +++ b/dali-toolkit/internal/text/text-scroller.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_SCROLLER_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. @@ -22,10 +22,11 @@ #include #include #include -#include // INTERNAL INCLUDES +#include #include +#include namespace Dali { @@ -66,7 +67,7 @@ public: * @param[in] alignmentOffset alignment of source text * */ - void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, float alignmentOffset ); + void SetParameters( Actor sourceActor, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, float alignmentOffset, Layout::HorizontalAlignment horizontalAlignment ); /** * @brief Set the gap distance to elapse before the text wraps around @@ -123,6 +124,11 @@ public: void SetStopMode( DevelTextLabel::AutoScrollStopMode::Type stopMode ); /** + * @brief Stop the auto scrolling. + */ + void StopScrolling(); + + /** * @brief Get the mode of scrolling stop * @return stopMode type when text scrolling is stoped. */