Implement Placeholder additional property 48/133248/20
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 9 Jun 2017 10:01:16 +0000 (19:01 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Fri, 30 Jun 2017 10:08:35 +0000 (19:08 +0900)
commit427f642f46df778c141cc7ab9718ce33d0ce01e1
treeb4fc98798a7d4347f10cf62d074d2703c333c60b
parent963a9277aba27b289d604503201775e5fc925bc3
Implement Placeholder additional property

- PLACEHOLDER property type is MAP :
  Text, Color, Font Family, Font Style, Point Size, and Pixel Size

Change-Id: If6d8d941865ebb0e21aa70830c3ac1981907bafb
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
12 files changed:
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/text/text-controller-impl.cpp
dali-toolkit/internal/text/text-controller-impl.h
dali-toolkit/internal/text/text-controller.cpp
dali-toolkit/internal/text/text-controller.h
dali-toolkit/internal/text/text-font-style.cpp
dali-toolkit/internal/text/text-font-style.h