projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
ae88beb
..
bc2459f
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
-#define
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#ifndef
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H
+#define
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-21,8
+21,11
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
+#include <dali-toolkit/internal/text/text-control-interface.h>
#include <dali-toolkit/internal/text/text-controller.h>
#include <dali-toolkit/internal/text/text-controller.h>
+#include <dali-toolkit/internal/text/text-scroller-interface.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
#include <dali-toolkit/internal/text/rendering/text-renderer.h>
+#include <dali-toolkit/internal/text/text-scroller.h>
namespace Dali
{
namespace Dali
{
@@
-36,7
+39,7
@@
namespace Internal
/**
* @brief A control which renders a short text string.
*/
/**
* @brief A control which renders a short text string.
*/
-class TextLabel : public Control, public Text::ControlInterface
+class TextLabel : public Control, public Text::ControlInterface
, public Text::ScrollerInterface
{
public:
{
public:
@@
-92,30
+95,19
@@
private: // From Control
*/
virtual float GetHeightForWidth( float width );
*/
virtual float GetHeightForWidth( float width );
- /**
- * @copydoc Text::ControlInterface::AddDecoration()
- */
- virtual void AddDecoration( Actor& actor, bool needsClipping );
-
- /**
- * @copydoc Control::OnStageConnection()
- */
- virtual void OnStageConnection( int depth );
+// From ControlInterface
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
/**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
- /**
- * @copydoc Text::ControlInterface::TextChanged()
- */
- virtual void TextChanged();
+private: // from TextScroller
/**
/**
- * @copydoc Text::
ControlInterface::MaxLengthReac
hed()
+ * @copydoc Text::
ScrollerInterface::ScrollingFinis
hed()
*/
*/
- virtual void
MaxLengthReac
hed();
+ virtual void
ScrollingFinis
hed();
private: // Implementation
private: // Implementation
@@
-143,10
+135,16
@@
private:
*/
void RenderText();
*/
void RenderText();
+ /**
+ * @brief Set up Autoscrolling
+ */
+ void SetUpAutoScrolling();
+
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
private: // Data
Text::ControllerPtr mController;
Text::RendererPtr mRenderer;
+ Text::TextScrollerPtr mTextScroller;
Actor mRenderableActor;
int mRenderingBackend;
bool mHasBeenStaged:1;
Actor mRenderableActor;
int mRenderingBackend;
bool mHasBeenStaged:1;
@@
-178,4
+176,4
@@
inline const Toolkit::Internal::TextLabel& GetImpl( const Toolkit::TextLabel& te
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H__
+#endif //
DALI_TOOLKIT_INTERNAL_TEXT_LABEL_H