Fix for text alignmnet and scrolling.

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

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 09a5ecc..5cd3308 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -25,6 +25,7 @@
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/scripting/scripting.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/adaptor-framework/virtual-keyboard.h>
 
@@ -53,6 +54,14 @@ namespace
 namespace
 {
 
+const Scripting::StringEnum< Toolkit::Text::LayoutEngine::Alignment > ALIGNMENT_STRING_TABLE[] =
+{
+  { "BEGIN",  Toolkit::Text::LayoutEngine::ALIGN_BEGIN  },
+  { "CENTER", Toolkit::Text::LayoutEngine::ALIGN_CENTER },
+  { "END",    Toolkit::Text::LayoutEngine::ALIGN_END    },
+};
+const unsigned int ALIGNMENT_STRING_TABLE_COUNT = sizeof( ALIGNMENT_STRING_TABLE ) / sizeof( ALIGNMENT_STRING_TABLE[0] );
+
 // Type registration
 BaseHandle Create()
 {
@@ -69,7 +78,6 @@ DALI_PROPERTY_REGISTRATION( TextField, "font-family",             STRING,    FON
 DALI_PROPERTY_REGISTRATION( TextField, "font-style",              STRING,    FONT_STYLE              )
 DALI_PROPERTY_REGISTRATION( TextField, "point-size",              FLOAT,     POINT_SIZE              )
 DALI_PROPERTY_REGISTRATION( TextField, "exceed-policy",           INTEGER,   EXCEED_POLICY           )
-DALI_PROPERTY_REGISTRATION( TextField, "cursor-image",            STRING,    CURSOR_IMAGE            )
 DALI_PROPERTY_REGISTRATION( TextField, "primary-cursor-color",    VECTOR4,   PRIMARY_CURSOR_COLOR    )
 DALI_PROPERTY_REGISTRATION( TextField, "secondary-cursor-color",  VECTOR4,   SECONDARY_CURSOR_COLOR  )
 DALI_PROPERTY_REGISTRATION( TextField, "enable-cursor-blink",     BOOLEAN,   ENABLE_CURSOR_BLINK     )
@@ -77,6 +85,7 @@ DALI_PROPERTY_REGISTRATION( TextField, "cursor-blink-interval",   FLOAT,     CUR
 DALI_PROPERTY_REGISTRATION( TextField, "cursor-blink-duration",   FLOAT,     CURSOR_BLINK_DURATION   )
 DALI_PROPERTY_REGISTRATION( TextField, "grab-handle-image",       STRING,    GRAB_HANDLE_IMAGE       )
 DALI_PROPERTY_REGISTRATION( TextField, "decoration bounding-box", RECTANGLE, DECORATION_BOUNDING_BOX )
+DALI_PROPERTY_REGISTRATION( TextField, "alignment",               STRING,    ALIGNMENT               )
 
 DALI_TYPE_REGISTRATION_END()
 
@@ -181,16 +190,6 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr
         impl.mExceedPolicy = value.Get< int >();
         break;
       }
-      case Toolkit::TextField::Property::CURSOR_IMAGE:
-      {
-        ResourceImage image = ResourceImage::New( value.Get< std::string >() );
-
-        if( impl.mDecorator )
-        {
-          impl.mDecorator->SetCursorImage( image );
-        }
-        break;
-      }
       case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
       {
         if( impl.mDecorator )
@@ -249,6 +248,20 @@ void TextField::SetProperty( BaseObject* object, Property::Index index, const Pr
         }
         break;
       }
+      case Toolkit::TextField::Property::ALIGNMENT:
+      {
+        LayoutEngine& engine = impl.mController->GetLayoutEngine();
+        const LayoutEngine::Alignment alignment = Scripting::GetEnumeration< Toolkit::Text::LayoutEngine::Alignment >( value.Get< std::string >().c_str(),
+                                                                                                                       ALIGNMENT_STRING_TABLE,
+                                                                                                                       ALIGNMENT_STRING_TABLE_COUNT );
+
+        if( engine.GetAlignment() != alignment )
+        {
+          engine.SetAlignment( alignment );
+          impl.RequestTextRelayout();
+        }
+        break;
+      }
     }
   }
 }
@@ -295,18 +308,6 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde
         value = impl.mExceedPolicy;
         break;
       }
-      case Toolkit::TextField::Property::CURSOR_IMAGE:
-      {
-        if( impl.mDecorator )
-        {
-          ResourceImage image = ResourceImage::DownCast( impl.mDecorator->GetCursorImage() );
-          if( image )
-          {
-            value = image.GetUrl();
-          }
-        }
-        break;
-      }
       case Toolkit::TextField::Property::PRIMARY_CURSOR_COLOR:
       {
         if( impl.mDecorator )
@@ -344,23 +345,21 @@ Property::Value TextField::GetProperty( BaseObject* object, Property::Index inde
         }
         break;
       }
-      case Toolkit::TextField::Property::GRAB_HANDLE_IMAGE:
+      case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
       {
         if( impl.mDecorator )
         {
-          ResourceImage image = ResourceImage::DownCast( impl.mDecorator->GetCursorImage() );
-          if( image )
-          {
-            value = image.GetUrl();
-          }
+          value = impl.mDecorator->GetBoundingBox();
         }
         break;
       }
-      case Toolkit::TextField::Property::DECORATION_BOUNDING_BOX:
+      case Toolkit::TextField::Property::ALIGNMENT:
       {
-        if( impl.mDecorator )
+        if( impl.mController )
         {
-          value = impl.mDecorator->GetBoundingBox();
+          value = std::string( Scripting::GetEnumerationName< Toolkit::Text::LayoutEngine::Alignment >( impl.mController->GetLayoutEngine().GetAlignment(),
+                                                                                                        ALIGNMENT_STRING_TABLE,
+                                                                                                        ALIGNMENT_STRING_TABLE_COUNT ) );
         }
         break;
       }
@@ -383,6 +382,7 @@ void TextField::OnInitialize()
   // Forward input events to controller
   EnableGestureDetection(Gesture::Tap);
   GetTapGestureDetector().SetMaximumTapsRequired( 2 );
+  EnableGestureDetection(Gesture::Pan);
 
   // Set BoundingBox to stage size if not already set.
   if ( mDecorator->GetBoundingBox().IsEmpty() )
@@ -412,9 +412,14 @@ void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container )
   if( mController->Relayout( size ) ||
       !mRenderer )
   {
+    const Vector2& scrollPosition = mController->GetScrollPosition();
+    const Vector2& alignmentOffset = mController->GetAlignmentOffset();
+
+    Vector2 offset = scrollPosition + alignmentOffset;
+
     if( mDecorator )
     {
-      mDecorator->Relayout( size );
+      mDecorator->Relayout( size, offset );
     }
 
     if( !mRenderer )
@@ -438,6 +443,8 @@ void TextField::OnRelayout( const Vector2& size, ActorSizeContainer& container )
 
     if( mRenderableActor )
     {
+      mRenderableActor.SetPosition( offset.x, offset.y );
+
       // Make sure the actor is parented correctly with/without clipping
       if( mClipper )
       {
@@ -503,6 +510,11 @@ void TextField::OnTap( const TapGesture& gesture )
   mController->TapEvent( gesture.numberOfTaps, gesture.localPoint.x, gesture.localPoint.y );
 }
 
+void TextField::OnPan( const PanGesture& gesture )
+{
+  mController->PanEvent( gesture.state, gesture.displacement );
+}
+
 bool TextField::OnKeyEvent( const KeyEvent& event )
 {
   if( Dali::DALI_KEY_ESCAPE == event.keyCode )
@@ -513,30 +525,19 @@ bool TextField::OnKeyEvent( const KeyEvent& event )
   return mController->KeyEvent( event );
 }
 
-ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData&  imfEvent )
+ImfManager::ImfCallbackData TextField::OnImfEvent( Dali::ImfManager& imfManager, const ImfManager::ImfEventData& imfEvent )
 {
   switch ( imfEvent.eventName )
   {
-    case ImfManager::PREEDIT:
-    {
-      // TODO
-      break;
-    }
     case ImfManager::COMMIT:
     {
-      // TODO
+      KeyEvent event( "", imfEvent.predictiveString, 0, 0, 0, KeyEvent::Down );
+      mController->KeyEvent( event );
       break;
     }
+    case ImfManager::PREEDIT: // fall through
     case ImfManager::DELETESURROUNDING:
-    {
-      // TODO
-      break;
-    }
     case ImfManager::GETSURROUNDING:
-    {
-      // TODO
-      break;
-    }
     case ImfManager::VOID:
     {
       // do nothing