Merge "Updated shader source to set precision explicitly" into tizen

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / text-input / text-input-decorator-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
index 3e90dd1..a529f37 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
@@ -15,11 +15,17 @@
  *
  */
 
+// CLASS HEADER
+#include <dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h>
+
+// EXTERNAL INCLUDES
+#include <dali/public-api/adaptor-framework/clipboard.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/events/pan-gesture.h>
+#include <dali/public-api/object/property-notification.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/text-input/text-input-decorator-impl.h>
-
 #include <dali-toolkit/internal/controls/text-input/text-input-handles-impl.h>
 
 using namespace Dali;
@@ -525,7 +531,7 @@ void Decorator::DrawCursor(const std::size_t nthChar)
   {
     DALI_ASSERT_DEBUG( ( 0 <= cursorPosition-1 ) && ( cursorPosition-1 < mTextViewCharacterPositioning.StyledTextSize() ) );
     const TextStyle styleAtCursor = mTextViewCharacterPositioning.GetStyleAt( cursorPosition-1 );
-    mCursor.SetRotation( styleAtCursor.GetItalics() ? Degree( styleAtCursor.GetItalicsAngle() - CURSOR_ANGLE_OFFSET ) : Degree( 0.f ), Vector3::ZAXIS );
+    mCursor.SetRotation( styleAtCursor.IsItalicsEnabled() ? Degree( styleAtCursor.GetItalicsAngle() - CURSOR_ANGLE_OFFSET ) : Degree( 0.f ), Vector3::ZAXIS );
   }
 
   DALI_ASSERT_DEBUG( cursorPosition <= mTextViewCharacterPositioning.GetNumberOfCharactersInText() );
@@ -691,7 +697,6 @@ void Decorator::CreateHighlight( Actor parent )
   {
     mHighlightMeshActor = MeshActor::New( mTextHighlight.CreateHighLightMesh() );
     mHighlightMeshActor.SetName( "HighlightMeshActor" );
-    mHighlightMeshActor.SetInheritShaderEffect( false );
     mHighlightMeshActor.SetAffectedByLighting(false);
     parent.Add( mHighlightMeshActor );
   }