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
Remove Constraints from Cluster,ToolBar,View & ImageView
[platform/core/uifw/dali-toolkit.git]
/
optional
/
dali-toolkit
/
internal
/
controls
/
cluster
/
cluster-impl.h
diff --git
a/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
b/optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
index
398b6a2
..
a7a30e0
100644
(file)
--- a/
optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
+++ b/
optional/dali-toolkit/internal/controls/cluster/cluster-impl.h
@@
-256,6
+256,12
@@
private: // From Control
*/
virtual void OnInitialize();
*/
virtual void OnInitialize();
+ /**
+ *
+ * @copydoc Toolkit::Control::OnControlSizeSet( const Vector3& targetSize )
+ */
+ virtual void OnControlSizeSet( const Vector3& targetSize );
+
protected:
/**
protected:
/**
@@
-281,6
+287,7
@@
private:
Toolkit::ClusterStyle mClusterStyle;
ChildInfoContainer mChildren;
Toolkit::ClusterStyle mClusterStyle;
ChildInfoContainer mChildren;
+ Vector3 mClusterSize;
Actor mBackgroundImage; ///< Stores the background image.
Actor mTitle; ///< Stores the text title.
Actor mBackgroundImage; ///< Stores the background image.
Actor mTitle; ///< Stores the text title.