Merge "If the size of the text is larger than the size of the control, setting it...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / decorator / text-decorator.cpp

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp
index a495768..bee7d9a 100644 (file)
--- a/dali-toolkit/internal/text/decorator/text-decorator.cpp
+++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp
@@ -22,8 +22,8 @@
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/timer.h>
-#include <dali/public-api/common/stage.h>
-#include <dali/public-api/events/touch-data.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/rendering/geometry.h>
@@ -1229,7 +1229,7 @@ struct Decorator::Impl : public ConnectionTracker
 
         if( ! mQuadVertices )
         {
-          mQuadVertices = PropertyBuffer::New( mQuadVertexFormat );
+          mQuadVertices = VertexBuffer::New( mQuadVertexFormat );
         }
 
         mQuadVertices.SetData( &vertices[ 0 ], vertices.Size() );
@@ -1363,7 +1363,7 @@ struct Decorator::Impl : public ConnectionTracker
     }
   }
 
-  bool OnGrabHandleTouched( Actor actor, const TouchData& touch )
+  bool OnGrabHandleTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& grabHandle = mHandle[GRAB_HANDLE];
 
@@ -1386,11 +1386,10 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( GRAB_HANDLE );
     }
 
-    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
-    return true;
+    return false;
   }
 
-  bool OnHandleOneTouched( Actor actor, const TouchData& touch )
+  bool OnHandleOneTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& primarySelectionHandle = mHandle[LEFT_SELECTION_HANDLE];
 
@@ -1417,11 +1416,10 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( LEFT_SELECTION_HANDLE );
     }
 
-    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
-    return true;
+    return false;
   }
 
-  bool OnHandleTwoTouched( Actor actor, const TouchData& touch )
+  bool OnHandleTwoTouched( Actor actor, const TouchEvent& touch )
   {
     HandleImpl& secondarySelectionHandle = mHandle[RIGHT_SELECTION_HANDLE];
 
@@ -1448,8 +1446,7 @@ struct Decorator::Impl : public ConnectionTracker
       SetHandleImage( RIGHT_SELECTION_HANDLE );
     }
 
-    // Consume to avoid pop-ups accidentally closing, when handle is outside of pop-up area
-    return true;
+    return false;
   }
 
   void HandleResetPosition( PropertyNotification& source )
@@ -1906,7 +1903,7 @@ struct Decorator::Impl : public ConnectionTracker
   CursorImpl          mCursor[CURSOR_COUNT];
   HandleImpl          mHandle[HANDLE_TYPE_COUNT];
 
-  PropertyBuffer      mQuadVertices;
+  VertexBuffer        mQuadVertices;
   Geometry            mQuadGeometry;
   QuadContainer       mHighlightQuadList;         ///< Sub-selections that combine to create the complete selection highlight.