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=16e350a7b37d847345e610f4f5cce3c1f28a9996;hp=daf258769950f87e79d3979e518e7e50fafa8427;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=6d44334a46a0b3321824ee05854cef4aa57b1e21 diff --git a/dali-toolkit/internal/text/text-scroller.h b/dali-toolkit/internal/text/text-scroller.h index daf2587..16e350a 100644 --- a/dali-toolkit/internal/text/text-scroller.h +++ b/dali-toolkit/internal/text/text-scroller.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SCROLLER_H__ -#define __DALI_TOOLKIT_TEXT_SCROLLER_H__ +#ifndef DALI_TOOLKIT_TEXT_SCROLLER_H +#define DALI_TOOLKIT_TEXT_SCROLLER_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -25,9 +25,9 @@ #include // INTERNAL INCLUDES +#include #include #include -#include namespace Dali { @@ -65,12 +65,13 @@ public: * @param[in] renderer renderer to render the text * @param[in] textureSet texture of the text to be scrolled * @param[in] controlSize size of the control to scroll within - * @param[in] textNaturalSize natural size of the text + * @param[in] textureSize size of the texture + * @param[in] wrapGap The gap before scrolling wraps * @param[in] direction text direction true for right to left text * @param[in] horizontalAlignment horizontal alignment of the text * @param[in] verticalAlignment vertical alignment of the text */ - void SetParameters( Actor scrollingTextActor, Dali::Renderer renderer, TextureSet textureSet, const Size& controlSize, const Size& offScreenSize, CharacterDirection direction, Layout::HorizontalAlignment horizontalAlignment, Layout::VerticalAlignment verticalAlignment ); + void SetParameters( Actor scrollingTextActor, Dali::Renderer renderer, TextureSet textureSet, const Size& controlSize, const Size& textureSize, const float wrapGap, CharacterDirection direction, HorizontalAlignment::Type horizontalAlignment, VerticalAlignment::Type verticalAlignment ); /** * @brief Set the gap distance to elapse before the text wraps around @@ -193,5 +194,5 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SCROLLER_H__ +#endif // DALI_TOOLKIT_TEXT_SCROLLER_H