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
Text - UNDERLINE, SHADOW, INPUT_UNDERLINE and INPUT_SHADOW properties refactor.
[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
c69bd7c
..
bdc587d
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
6
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,8
@@
// 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
ler
.h>
-#include <dali-toolkit/internal/
text/rendering/text-renderer
.h>
+#include <dali-toolkit/internal/text/text-control
-interface
.h>
+#include <dali-toolkit/internal/
visuals/text/text-visual
.h>
namespace Dali
{
namespace Dali
{
@@
-75,7
+75,7
@@
private: // From Control
/**
* @copydoc Control::OnStyleChange()
*/
/**
* @copydoc Control::OnStyleChange()
*/
- virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change );
+ virtual void OnStyleChange( Toolkit::StyleManager styleManager, StyleChange
::Type
change );
/**
* @copydoc Control::OnRelayout()
/**
* @copydoc Control::OnRelayout()
@@
-93,6
+93,13
@@
private: // From Control
virtual float GetHeightForWidth( float width );
/**
virtual float GetHeightForWidth( float width );
/**
+ * @copydoc Control::OnStageConnection()
+ */
+ virtual void OnStageConnection( int depth );
+
+// From ControlInterface
+
+ /**
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
* @copydoc Text::ControlInterface::RequestTextRelayout()
*/
virtual void RequestTextRelayout();
@@
-117,11
+124,7
@@
private:
private: // Data
private: // Data
- Text::ControllerPtr mController;
- Text::RendererPtr mRenderer;
- RenderableActor mRenderableActor;
-
- int mRenderingBackend;
+ Toolkit::Visual::Base mVisual;
};
} // namespace Internal
};
} // namespace Internal
@@
-150,4
+153,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