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
Merge "Fix the warning log in Control causing the wrong position" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.h
diff --git
a/dali-toolkit/public-api/controls/control-impl.h
b/dali-toolkit/public-api/controls/control-impl.h
index
9993237
..
d850eb4
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.h
+++ b/
dali-toolkit/public-api/controls/control-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_CONTROL_IMPL_H
/*
#define DALI_TOOLKIT_CONTROL_IMPL_H
/*
- * Copyright (c) 201
6
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.
@@
-76,12
+76,14
@@
public:
*/
static Toolkit::Control New();
*/
static Toolkit::Control New();
+protected:
/**
* @brief Virtual destructor.
* @SINCE_1_0.0
*/
virtual ~Control();
/**
* @brief Virtual destructor.
* @SINCE_1_0.0
*/
virtual ~Control();
+public:
// Styling
/**
// Styling
/**
@@
-391,7
+393,7
@@
protected: // From CustomActorImpl, not to be used by application developers
/**
* @copydoc CustomActorImpl::OnStageConnection()
/**
* @copydoc CustomActorImpl::OnStageConnection()
- * @note If overridden, then an up-call to Control::OnStageConnection MUST be made at the
start
.
+ * @note If overridden, then an up-call to Control::OnStageConnection MUST be made at the
end
.
*/
virtual void OnStageConnection( int depth );
*/
virtual void OnStageConnection( int depth );
@@
-403,7
+405,7
@@
protected: // From CustomActorImpl, not to be used by application developers
/**
* @copydoc CustomActorImpl::OnChildAdd()
/**
* @copydoc CustomActorImpl::OnChildAdd()
- * @note If overridden, then an up-call to Control::OnChildAdd MUST be made at the
start
.
+ * @note If overridden, then an up-call to Control::OnChildAdd MUST be made at the
end
.
*/
virtual void OnChildAdd( Actor& child );
*/
virtual void OnChildAdd( Actor& child );
@@
-414,14
+416,20
@@
protected: // From CustomActorImpl, not to be used by application developers
virtual void OnChildRemove( Actor& child );
/**
virtual void OnChildRemove( Actor& child );
/**
+ * @copydoc CustomActorImpl::OnPropertySet()
+ * @note If overridden, then an up-call to Control::OnChildRemove MUST be made at the end.
+ */
+ virtual void OnPropertySet( Property::Index index, Property::Value propertyValue );
+
+ /**
* @copydoc CustomActorImpl::OnSizeSet()
* @copydoc CustomActorImpl::OnSizeSet()
- * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the
start
.
+ * @note If overridden, then an up-call to Control::OnSizeSet MUST be made at the
end
.
*/
virtual void OnSizeSet( const Vector3& targetSize );
/**
* @copydoc CustomActorImpl::OnSizeAnimation()
*/
virtual void OnSizeSet( const Vector3& targetSize );
/**
* @copydoc CustomActorImpl::OnSizeAnimation()
- * @note If overridden, then an up-call to Control::OnSizeAnimation MUST be made at the
start
.
+ * @note If overridden, then an up-call to Control::OnSizeAnimation MUST be made at the
end
.
*/
virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize );
*/
virtual void OnSizeAnimation( Animation& animation, const Vector3& targetSize );
@@
-547,7
+555,7
@@
public: // API for derived classes to override
* @SINCE_1_0.0
* @param[in] child The added actor.
*/
* @SINCE_1_0.0
* @param[in] child The added actor.
*/
- virtual void OnControlChildAdd( Actor& child );
+ virtual void OnControlChildAdd( Actor& child )
DALI_DEPRECATED_API
;
/**
* @DEPRECATED_1_1.30. Override OnChildRemove instead.
/**
* @DEPRECATED_1_1.30. Override OnChildRemove instead.
@@
-559,7
+567,7
@@
public: // API for derived classes to override
* @SINCE_1_0.0
* @param[in] child The removed actor.
*/
* @SINCE_1_0.0
* @param[in] child The removed actor.
*/
- virtual void OnControlChildRemove( Actor& child );
+ virtual void OnControlChildRemove( Actor& child )
DALI_DEPRECATED_API
;
// Styling
// Styling