Add color lookup into Builder & apply changeable color on TextInput

Change-Id: I4720b85f7df61ead9f1b1e0486792d6770b6c070
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/base/dali-toolkit/internal/builder/builder-set-property.cpp b/base/dali-toolkit/internal/builder/builder-set-property.cpp
index 71ae7a0..63738c8 100644 (file)
--- a/base/dali-toolkit/internal/builder/builder-set-property.cpp
+++ b/base/dali-toolkit/internal/builder/builder-set-property.cpp
@@ -18,11 +18,14 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 
+#include <dali/public-api/adaptor-framework/common/color-controller.h>
+
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/builder/builder-impl.h>
 #include <dali-toolkit/internal/builder/builder-get-is.inl.h>
 #include <dali-toolkit/internal/builder/replacement.h>
 
+
 namespace Dali
 {
 
@@ -248,6 +251,12 @@ bool SetPropertyFromNode( const TreeNode& node, Property::Type type, Property::V
           value = HexStringToVector4( &(*s)[1] );
           done = true;
         }
+        else if( Dali::ColorController::Get() )
+        {
+          Vector4 color;
+          done = Dali::ColorController::Get().RetrieveColor( *s, color );
+          value = color;
+        }
       }
       else if( TreeNode::OBJECT == node.GetType() )
       {

diff --git a/base/dali-toolkit/public-api/controls/control-impl.cpp b/base/dali-toolkit/public-api/controls/control-impl.cpp
index d26e2f4..456393c 100644 (file)
--- a/base/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/base/dali-toolkit/public-api/controls/control-impl.cpp
@@ -572,6 +572,9 @@ void Control::Initialize()
 
     // Register for style changes
     styleManager.StyleChangeSignal().Connect( this, &ControlImpl::DoStyleChange );
+
+    // SetTheme
+    GetImpl( styleManager ).ApplyThemeStyle( GetOwner() );
   }
 
   mImpl->mInitialized = true;

diff --git a/base/dali-toolkit/styles/tizen-dark-theme.json b/base/dali-toolkit/styles/tizen-dark-theme.json
index 4f1e5d7..116a8f4 100644 (file)
--- a/base/dali-toolkit/styles/tizen-dark-theme.json
+++ b/base/dali-toolkit/styles/tizen-dark-theme.json
@@ -31,5 +31,17 @@ distributing this software or its derivatives.
 {
   "styles":
   {
+    "textinput":
+    {
+      "highlight-color":"F060",
+      "cut-and-paste-bg-color":"B061L41",
+      "cut-and-paste-pressed-color":"B061L41P",
+      "cut-button-position-priority":4,
+      "copy-button-position-priority":3,
+      "paste-button-position-priority":5,
+      "select-button-position-priority":1,
+      "select-all-button-position-priority":2,
+      "clipboard-button-position-priority":6
+    }
   }
 }
\ No newline at end of file