Merge "Extending Style - Adding Strikethrough" into devel/master

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index 621c634,5f27aeb..bee836e
--- 1/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@@ -353,8 -353,8 +354,9 @@@ int UtcDaliToolkitTextLabelGetPropertyP
    DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS ) == TextLabel::Property::ELLIPSIS );
    DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_AUTO_SCROLL_LOOP_DELAY ) == TextLabel::Property::AUTO_SCROLL_LOOP_DELAY );
    DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_FONT_SIZE_SCALE ) == DevelTextLabel::Property::FONT_SIZE_SCALE );
 +  DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ENABLE_FONT_SIZE_SCALE ) == DevelTextLabel::Property::ENABLE_FONT_SIZE_SCALE );
    DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_ELLIPSIS_POSITION ) == DevelTextLabel::Property::ELLIPSIS_POSITION );
+   DALI_TEST_CHECK( label.GetPropertyIndex( PROPERTY_NAME_STRIKETHROUGH ) == DevelTextLabel::Property::STRIKETHROUGH );
  
    END_TEST;
  }

diff --cc dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h
Simple merge

diff --cc dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
Simple merge

diff --cc dali-toolkit/devel-api/controls/text-controls/text-label-devel.h
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-editor-property-handler.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-property-handler.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 8fec200,d1cde22..9ef8ed1
--- 1/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
--- 2/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@@ -136,8 -136,8 +136,9 @@@ DALI_DEVEL_PROPERTY_REGISTRATION(Toolki
  DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "minLineSize",                  FLOAT,   MIN_LINE_SIZE                  )
  DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "renderingBackend",             INTEGER, RENDERING_BACKEND              )
  DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "fontSizeScale",                FLOAT,   FONT_SIZE_SCALE                )
 +DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "enableFontSizeScale",          BOOLEAN, ENABLE_FONT_SIZE_SCALE         )
  DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "ellipsisPosition",             INTEGER, ELLIPSIS_POSITION              )
+ DALI_DEVEL_PROPERTY_REGISTRATION(Toolkit,           TextLabel, "strikethrough",                MAP,     STRIKETHROUGH                  )
  
  DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT(Toolkit, TextLabel, "textColor",      Color::BLACK,     TEXT_COLOR   )
  DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION(Toolkit,    TextLabel, "textColorRed",   TEXT_COLOR_RED,   TEXT_COLOR, 0)

diff --cc dali-toolkit/internal/text/text-controller-impl.h
Simple merge

diff --cc dali-toolkit/internal/text/text-controller.cpp
Simple merge

diff --cc dali-toolkit/internal/text/text-controller.h
Simple merge

diff --cc dali-toolkit/internal/text/text-view.cpp
Simple merge