Merge branch devel/master (1.0.49) into tizen

[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 fa7e67e..c7e8555 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -22,10 +22,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/text-abstraction/text-abstraction.h>
+#include <iostream>
 
 // INTERNAL INCLUDES
 #include "shared/multi-language-strings.h"
+#include "shared/view.h"
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -33,10 +34,11 @@ using namespace MultiLanguageStrings;
 
 namespace
 {
-  const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "button-up.9.png";
+  const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "grab-handle.png";
 
   const unsigned int KEY_ZERO = 10;
   const unsigned int KEY_ONE = 11;
+  const unsigned int KEY_F = 41;
   const unsigned int KEY_H = 43;
   const unsigned int KEY_V = 55;
   const unsigned int KEY_M = 58;
@@ -103,21 +105,18 @@ public:
     mContainer = Control::New();
     mContainer.SetName( "Container" );
     mContainer.SetParentOrigin( ParentOrigin::CENTER );
-    mContainer.SetResizePolicy( FIXED, ALL_DIMENSIONS );
     mLayoutSize = Vector2(stageSize.width*0.6f, stageSize.width*0.6f);
-    mContainer.SetPreferredSize( mLayoutSize );
-    mContainer.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) );
-    mContainer.GetChildAt(0).SetZ(-1.0f);
+    mContainer.SetSize( mLayoutSize );
+    mContainer.SetDrawMode( DrawMode::OVERLAY_2D );
     stage.Add( mContainer );
 
     // Resize the center layout when the corner is grabbed
     mGrabCorner = Control::New();
     mGrabCorner.SetName( "GrabCorner" );
-    mGrabCorner.SetAnchorPoint( AnchorPoint::BOTTOM_RIGHT );
+    mGrabCorner.SetAnchorPoint( AnchorPoint::TOP_CENTER );
     mGrabCorner.SetParentOrigin( ParentOrigin::BOTTOM_RIGHT );
-    mGrabCorner.SetResizePolicy( FIXED, ALL_DIMENSIONS );
-    mGrabCorner.SetPreferredSize( Vector2(stageSize.width*0.1f, stageSize.width*0.1f) );
-    mGrabCorner.SetZ(1.0f);
+    mGrabCorner.SetBackgroundImage( ResourceImage::New( BACKGROUND_IMAGE ) );
+    mGrabCorner.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
     mContainer.Add( mGrabCorner );
 
     mPanGestureDetector = PanGestureDetector::New();
@@ -127,10 +126,13 @@ public:
     mLabel = TextLabel::New( "A Quick Brown Fox Jumps Over The Lazy Dog" );
     mLabel.SetName( "TextLabel" );
     mLabel.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-    mLabel.SetResizePolicy( FILL_TO_PARENT, HEIGHT );
+    mLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+    mLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
     mLabel.SetProperty( TextLabel::Property::MULTI_LINE, true );
+    mLabel.SetProperty( TextLabel::Property::TEXT_COLOR, Color::BLUE );
     mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 1.0f, 1.0f ) );
     mLabel.SetProperty( TextLabel::Property::SHADOW_COLOR, Color::BLACK );
+    mLabel.SetBackgroundColor( Color::WHITE );
     mContainer.Add( mLabel );
 
     Property::Value labelText = mLabel.GetProperty( TextLabel::Property::TEXT );
@@ -150,7 +152,7 @@ public:
       Vector2 clampedSize = Vector2( ConvertToEven(static_cast<int>(mLayoutSize.x)),
                                      ConvertToEven(static_cast<int>(mLayoutSize.y)) );
 
-      mContainer.SetPreferredSize( clampedSize );
+      mContainer.SetSize( clampedSize );
     }
   }
 
@@ -169,13 +171,26 @@ public:
       {
         switch( event.keyCode )
         {
+          // Select rendering back-end
           case KEY_ZERO: // fall through
           case KEY_ONE:
           {
             mLabel.SetProperty( TextLabel::Property::RENDERING_BACKEND, event.keyCode - 10 );
             break;
           }
-          case KEY_H:
+          case KEY_F: // Fill vertically
+          {
+            if( ResizePolicy::DIMENSION_DEPENDENCY == mLabel.GetResizePolicy(Dimension::HEIGHT) )
+            {
+              mLabel.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
+            }
+            else
+            {
+              mLabel.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
+            }
+            break;
+          }
+          case KEY_H: // Horizontal alignment
           {
             if( ++mAlignment >= H_ALIGNMENT_STRING_COUNT )
             {
@@ -185,7 +200,7 @@ public:
             mLabel.SetProperty( TextLabel::Property::HORIZONTAL_ALIGNMENT, H_ALIGNMENT_STRING_TABLE[ mAlignment ] );
             break;
           }
-          case KEY_V:
+          case KEY_V: // Vertical alignment
           {
             if( ++mAlignment >= V_ALIGNMENT_STRING_COUNT )
             {
@@ -195,13 +210,13 @@ public:
             mLabel.SetProperty( TextLabel::Property::VERTICAL_ALIGNMENT, V_ALIGNMENT_STRING_TABLE[ mAlignment ] );
             break;
           }
-          case KEY_M:
+          case KEY_M: // Multi-line
           {
             bool multiLine = mLabel.GetProperty<bool>( TextLabel::Property::MULTI_LINE );
             mLabel.SetProperty( TextLabel::Property::MULTI_LINE, !multiLine );
             break;
           }
-          case KEY_L:
+          case KEY_L: // Language
           {
             const Language& language = LANGUAGES[ mLanguageId ];
 
@@ -213,7 +228,7 @@ public:
             }
             break;
           }
-          case KEY_S:
+          case KEY_S: // Shadow color
           {
             if( Color::BLACK == mLabel.GetProperty<Vector4>( TextLabel::Property::SHADOW_COLOR ) )
             {
@@ -225,12 +240,12 @@ public:
             }
             break;
           }
-          case KEY_PLUS:
+          case KEY_PLUS: // Increase shadow offset
           {
             mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, mLabel.GetProperty<Vector2>( TextLabel::Property::SHADOW_OFFSET ) + Vector2( 1.0f, 1.0f ) );
             break;
           }
-          case KEY_MINUS:
+          case KEY_MINUS: // Decrease shadow offset
           {
             mLabel.SetProperty( TextLabel::Property::SHADOW_OFFSET, mLabel.GetProperty<Vector2>( TextLabel::Property::SHADOW_OFFSET ) - Vector2( 1.0f, 1.0f ) );
             break;
@@ -248,7 +263,7 @@ private:
   TextLabel mLabel;
 
   Control mContainer;
-  Actor mGrabCorner;
+  Control mGrabCorner;
 
   PanGestureDetector mPanGestureDetector;
 
@@ -268,7 +283,7 @@ void RunTest( Application& application )
 /** Entry point for Linux & Tizen applications */
 int main( int argc, char **argv )
 {
-  Application application = Application::New( &argc, &argv );
+  Application application = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
 
   RunTest( application );