Remove ResourceImage usage from demos

[platform/core/uifw/dali-demo.git] / examples / text-label / text-label-example.cpp

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index 9d12f7d..b2ad9a5 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -34,7 +34,7 @@ using namespace MultiLanguageStrings;
 
 namespace
 {
-  const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "grab-handle.png";
+  const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "grab-handle.png";
 
   const unsigned int KEY_ZERO = 10;
   const unsigned int KEY_ONE = 11;
@@ -107,15 +107,14 @@ public:
     mContainer.SetParentOrigin( ParentOrigin::CENTER );
     mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f);
     mContainer.SetSize( mLayoutSize );
-    mContainer.SetDrawMode( DrawMode::OVERLAY );
+    mContainer.SetDrawMode( DrawMode::OVERLAY_2D );
     stage.Add( mContainer );
 
     // Resize the center layout when the corner is grabbed
-    mGrabCorner = Control::New();
+    mGrabCorner = ImageView::New( BACKGROUND_IMAGE );
     mGrabCorner.SetName( "GrabCorner" );
     mGrabCorner.SetAnchorPoint( AnchorPoint::TOP_CENTER );
     mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT );
-    mGrabCorner.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) );
     mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
     mContainer.Add( mGrabCorner );
 
@@ -142,15 +141,29 @@ public:
   // Resize the text-label with pan gesture
   void OnPan( Actor actor, const PanGesture& gesture )
   {
+    // Reset mLayoutSize when the pan starts
+    if( gesture.state == Gesture::Started )
+    {
+      if( mLayoutSize.x < 2.0f )
+      {
+        mLayoutSize.x = 2.0f;
+      }
+
+      if( mLayoutSize.y < 2.0f )
+      {
+        mLayoutSize.y = 2.0f;
+      }
+    }
+
     mLayoutSize.x += gesture.displacement.x * 2.0f;
     mLayoutSize.y += gesture.displacement.y * 2.0f;
 
-    if( mLayoutSize.x >= 2.0f &&
+    if( mLayoutSize.x >= 2.0f ||
         mLayoutSize.y >= 2.0f )
     {
       // Avoid pixel mis-alignment issue
-      Vector2 clampedSize = Vector2( ConvertToEven(static_cast<int>(mLayoutSize.x)),
-                                     ConvertToEven(static_cast<int>(mLayoutSize.y)) );
+      Vector2 clampedSize = Vector2( std::max( ConvertToEven( static_cast<int>( mLayoutSize.x )), 2 ),
+                                     std::max( ConvertToEven( static_cast<int>( mLayoutSize.y )), 2 ) );
 
       mContainer.SetSize( clampedSize );
     }
@@ -281,9 +294,9 @@ void RunTest( Application& application )
 }
 
 /** Entry point for Linux & Tizen applications */
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
+  Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
 
   RunTest( application );