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 "TextModel - Clear the buffers if the number of items is zero." into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
5623a11
..
b061330
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-75,9
+75,10
@@
private:
LAYOUT = 0x0080,
UPDATE_ACTUAL_SIZE = 0x0100,
UPDATE_POSITIONS = 0x0200,
- REORDER = 0x0400,
- ALIGNMENT = 0x0800,
- RENDER = 0x1000,
+ UPDATE_LINES = 0x0400,
+ REORDER = 0x0800,
+ ALIGNMENT = 0x1000,
+ RENDER = 0x2000,
ALL_OPERATIONS = 0xFFFF
};