Merge "Added style name for styling TextEditor ScrollBar" into devel/master

diff --combined dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index e103702,ff9a1f5..ca78a26
--- 1/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
--- 2/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@@ -32,7 -32,6 +32,7 @@@
  // INTERNAL INCLUDES
  #include <dali-toolkit/public-api/text/rendering-backend.h>
  #include <dali-toolkit/public-api/visuals/color-visual-properties.h>
 +#include <dali-toolkit/devel-api/controls/control-devel.h>
  #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
  #include <dali-toolkit/devel-api/controls/text-controls/text-editor-devel.h>
  #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@@ -135,9 -134,6 +135,9 @@@ DALI_DEVEL_PROPERTY_REGISTRATION( Toolk
  DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarShowDuration",          FLOAT,     SCROLL_BAR_SHOW_DURATION             )
  DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "scrollBarFadeDuration",          FLOAT,     SCROLL_BAR_FADE_DURATION             )
  DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "pixelSize",                      FLOAT,     PIXEL_SIZE                           )
 +DALI_DEVEL_PROPERTY_REGISTRATION_READ_ONLY( Toolkit, TextEditor, "lineCount",            INTEGER,   LINE_COUNT                           )
 +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderText",                STRING,    PLACEHOLDER_TEXT                     )
 +DALI_DEVEL_PROPERTY_REGISTRATION( Toolkit, TextEditor, "placeholderTextColor",           VECTOR4,   PLACEHOLDER_TEXT_COLOR               )
  
  DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "textChanged",        SIGNAL_TEXT_CHANGED )
  DALI_SIGNAL_REGISTRATION( Toolkit, TextEditor, "inputStyleChanged",  SIGNAL_INPUT_STYLE_CHANGED )
@@@ -664,32 -660,6 +664,32 @@@ void TextEditor::SetProperty( BaseObjec
          }
          break;
        }
 +      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
 +      {
 +        if( impl.mController )
 +        {
 +          const std::string& text = value.Get< std::string >();
 +          DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor::OnPropertySet %p PLACEHOLDER_TEXT %s\n", impl.mController.Get(), text.c_str() );
 +
 +          impl.mController->SetPlaceholderText( text );
 +        }
 +        break;
 +      }
 +      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
 +      {
 +        if( impl.mController )
 +        {
 +          const Vector4& textColor = value.Get< Vector4 >();
 +          DALI_LOG_INFO( gLogFilter, Debug::General, "TextEditor %p PLACEHOLDER_TEXT_COLOR %f,%f,%f,%f\n", impl.mController.Get(), textColor.r, textColor.g, textColor.b, textColor.a );
 +
 +          if( impl.mController->GetPlaceholderTextColor() != textColor )
 +          {
 +            impl.mController->SetPlaceholderTextColor( textColor );
 +            impl.mRenderer.Reset();
 +          }
 +        }
 +        break;
 +      }
      } // switch
    } // texteditor
  }
@@@ -1024,33 -994,6 +1024,33 @@@ Property::Value TextEditor::GetProperty
          }
          break;
        }
 +      case Toolkit::DevelTextEditor::Property::LINE_COUNT:
 +      {
 +        if( impl.mController )
 +        {
 +          float width = textEditor.GetProperty( Actor::Property::SIZE_WIDTH ).Get<float>();
 +          value = impl.mController->GetLineCount( width );
 +        }
 +        break;
 +      }
 +      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT:
 +      {
 +        if( impl.mController )
 +        {
 +          std::string text;
 +          impl.mController->GetPlaceholderText( text );
 +          value = text;
 +        }
 +        break;
 +      }
 +      case Toolkit::DevelTextEditor::Property::PLACEHOLDER_TEXT_COLOR:
 +      {
 +        if( impl.mController )
 +        {
 +          value = impl.mController->GetPlaceholderTextColor();
 +        }
 +        break;
 +      }
      } //switch
    }
  
@@@ -1516,6 -1459,15 +1516,15 @@@ void TextEditor::UpdateScrollBar(
  
      mScrollBar.SetScrollPropertySource(self, propertyScrollPosition, propertyMinScrollPosition, propertyMaxScrollPosition, propertyScrollContentSize);
  
+     // Set style name of ScrollBar for styling
+     mScrollBar.SetStyleName("TextEditorScrollBar");
+     Toolkit::Control scrollIndicator = Toolkit::Control::DownCast( mScrollBar.GetScrollIndicator() );
+     if( scrollIndicator )
+     {
+       // Set style name of ScrollBarIndicator for styling
+       scrollIndicator.SetStyleName("TextEditorScrollBarIndicator");
+     }
+ 
      self.Add( mScrollBar );
    }
    else