projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5f532a
)
Revert "[Tizen] Ensuring CustomActor behaviour flags retain expected values"
author
Daekwang Ryu
<dkdk.ryu@samsung.com>
Tue, 6 Oct 2020 03:07:28 +0000
(12:07 +0900)
committer
Daekwang Ryu
<dkdk.ryu@samsung.com>
Tue, 6 Oct 2020 03:07:28 +0000
(12:07 +0900)
This reverts commit
ea140b46a6d979d52b9f775557e6354d8e96ba99
.
dali/public-api/actors/custom-actor-impl.h
patch
|
blob
|
history
diff --git
a/dali/public-api/actors/custom-actor-impl.h
b/dali/public-api/actors/custom-actor-impl.h
index
3afaa88
..
11bb9e4
100644
(file)
--- a/
dali/public-api/actors/custom-actor-impl.h
+++ b/
dali/public-api/actors/custom-actor-impl.h
@@
-288,9
+288,6
@@
protected: // For derived classes
{
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
- NOT_IN_USE_1 = 1<<1,
- NOT_IN_USE_2 = 1<<2,
- NOT_IN_USE_3 = 1<<3,
LAST_ACTOR_FLAG ///< Special marker for last actor flag @SINCE_1_0.0
};