Merge "Extending Style - Adding Strikethrough" into devel/master
authorBowon Ryu <bowon.ryu@samsung.com>
Mon, 10 Jan 2022 10:32:53 +0000 (10:32 +0000)
committerGerrit Code Review <gerrit@review>
Mon, 10 Jan 2022 10:32:53 +0000 (10:32 +0000)
commitfa834a987e844fb79531954c882581624aef0e68
tree0edc750436276f39bffeccf65a505cf9881f89c2
parenta70d28d882e56f123f8eec322b4ca9594b2307cd
parentfb87251cfeff34418a36798700b81786e522018a
Merge "Extending Style - Adding Strikethrough" into devel/master
15 files changed:
automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
automated-tests/src/dali-toolkit/utc-Dali-TextLabel.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/devel-api/controls/text-controls/text-label-devel.h
dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
dali-toolkit/internal/controls/text-controls/text-label-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-view.cpp