From 00d878eebed0d9f91d0aecb7fdee90d9db2ef3ca Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 4 Oct 2016 14:03:13 +0100 Subject: [PATCH] [3.0] Added a new default for ActorBehaviour. The default behaviour for actors is now to have Size Negotiation switched on. Thus, the name ACTOR_BEHAVIOUR_NONE is wrong. Have deprecated ACTOR_BEHAVIOUR_NONE, and added a new ACTOR_BEHAVIOUR_DEFAULT instead. Change-Id: I79812715a8dd9b4eb8aa2d41819bcb6c9e403e3d Signed-off-by: David Steele (cherry picked from commit e43a9524565c56024a65ec4c198533d2f7bbd570) --- dali/public-api/actors/custom-actor-impl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dali/public-api/actors/custom-actor-impl.h b/dali/public-api/actors/custom-actor-impl.h index a9c1a00..f1d8ed8 100644 --- a/dali/public-api/actors/custom-actor-impl.h +++ b/dali/public-api/actors/custom-actor-impl.h @@ -325,7 +325,8 @@ protected: // For derived classes */ enum ActorFlags { - ACTOR_BEHAVIOUR_NONE = 0, + ACTOR_BEHAVIOUR_NONE = 0, ///< Use if no change to default behaviour is needed. @DEPRECATED_1_2_10 + ACTOR_BEHAVIOUR_DEFAULT = 0, ///< Use to provide default behaviour (size negotiation is on, event callbacks are not called). @SINCE_1_2_10 DISABLE_SIZE_NEGOTIATION = 1 << 0, ///< True if control does not need size negotiation, i.e. it can be skipped in the algorithm @SINCE_1_0.0 REQUIRES_TOUCH_EVENTS = 1 << 1, ///< True if the OnTouchEvent() callback is required. @SINCE_1_0.0 REQUIRES_HOVER_EVENTS = 1 << 2, ///< True if the OnHoverEvent() callback is required. @SINCE_1_0.0 -- 2.7.4