[dali_1.0.49] Merge branch 'devel/master'

Change-Id: Ieaa69fde05176af58de6161fdce4b9dd80fd5ffb

[dali_1.0.49] Merge branch 'devel/master'
Change-Id: Ieaa69fde05176af58de6161fdce4b9dd80fd5ffb
Nick Holland
2 parents ad1313b2 2cc32862
Showing 20 changed files with 66 additions and 55 deletions
examples/cluster/cluster-example.cpp
examples/cluster/cluster-impl.cpp
examples/cluster/cluster-impl.h
examples/cluster/cluster.cpp
examples/cluster/cluster.h
examples/cube-transition-effect/cube-transition-effect-example.cpp
examples/item-view/item-view-example.cpp
examples/line-mesh/line-mesh-example.cpp
examples/mesh-sorting/mesh-sorting-example.cpp
examples/new-window/new-window-example.cpp
examples/radial-menu/radial-sweep-view-impl.cpp
examples/text-field/text-field-example.cpp
examples/text-label/text-label-example.cpp
examples/textured-mesh/textured-mesh-example.cpp
packaging/com.samsung.dali-demo.spec
resources/scripts/animated-colors.json
resources/scripts/background-color.json
resources/scripts/table-view.json
resources/style/demo-theme.json
resources/style/mobile/demo-theme.json
@@ -456,8 +456,8 @@ public:
     // fitting it inside a quarter of the stage area with the conservative BOX
     // filter mode:
     Image bg = ResourceImage::New( CLUSTER_BACKGROUND_IMAGE_PATH, Dali::ImageDimensions( stageSize.x * 0.5f, stageSize.y * 0.5f ), Dali::FittingMode::SHRINK_TO_FIT, Dali::SamplingMode::BOX );
-    ImageActor image = ImageActor::New(bg);
-    clusterActor.SetBackgroundImage(image);
+    Control clusterControl = Control::DownCast( clusterActor );
+    clusterControl.SetBackgroundImage( bg );
     // Add actors (pictures) as the children of the cluster
     for (unsigned int i = 0; (i < style.GetMaximumNumberOfChildren()) && (*paths); i++, paths++)
@@ -374,23 +374,6 @@ void Cluster::RestoreChild( unsigned int index, AlphaFunction alpha, const TimeP
   }
 }
-void Cluster::SetBackgroundImage( Actor image )
-{
-  // Replaces the background image.
-  if(mBackgroundImage && mBackgroundImage.GetParent())
-  {
-    mBackgroundImage.GetParent().Remove(mBackgroundImage);
-  }
-
-  mBackgroundImage = image;
-  Self().Add(mBackgroundImage);
-
-  mBackgroundImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  mBackgroundImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
-
-  UpdateBackground(0.0f);
-}
-
 void Cluster::SetTitle( Actor text )
 {
   // Replaces the title actor.
@@ -156,11 +156,6 @@ public:
   void RestoreChild( unsigned int index, AlphaFunction alpha, const TimePeriod& period, bool front );
   /**
-   * @copydoc Demo::Cluster::SetBackgroundImage
-   */
-  void SetBackgroundImage( Actor image );
-
-  /**
    * @copydoc Demo::Cluster::SetTitle
    */
   void SetTitle( Actor text );
@@ -127,11 +127,6 @@ void Cluster::RestoreChild( unsigned int index, AlphaFunction alpha, const TimeP
   GetImpl(*this).RestoreChild( index, alpha, period, front );
 }
-void Cluster::SetBackgroundImage( Actor image )
-{
-  GetImpl(*this).SetBackgroundImage(image);
-}
-
 void Cluster::SetTitle( Actor text )
 {
   GetImpl(*this).SetTitle(text);
@@ -206,12 +206,6 @@ public:
   void RestoreChild( unsigned int index, AlphaFunction alpha, const TimePeriod& period, bool front = false );
   /**
-   * Sets the background image.
-   * @param[in] image The background image.
-   */
-  void SetBackgroundImage( Actor image );
-
-  /**
    * Sets the title.
    *
    * @param[in] text Title text.
@@ -238,6 +238,7 @@ void CubeTransitionApp::OnInit( Application&amp; application )
   // Creates a default view with a default tool bar, the view is added to the stage.
   mContent = DemoHelper::CreateView( application, mView, mToolBar, "", TOOLBAR_IMAGE, "" );
+  mContent.SetBehavior( Layer::LAYER_3D );
   // Add an effect-changing button on the right of the tool bar.
   mImageWave = ResourceImage::New( EFFECT_WAVE_IMAGE );
@@ -250,7 +250,7 @@ public:
     mDeleteButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mDeleteButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mDeleteButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mDeleteButton.SetDrawMode( DrawMode::OVERLAY );
+    mDeleteButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mDeleteButton.SetButtonImage( ResourceImage::New( DELETE_IMAGE ) );
     mDeleteButton.SetSelectedImage( ResourceImage::New( DELETE_IMAGE_SELECTED ) );
     mDeleteButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
@@ -265,7 +265,7 @@ public:
     mInsertButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mInsertButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mInsertButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mInsertButton.SetDrawMode( DrawMode::OVERLAY );
+    mInsertButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mInsertButton.SetButtonImage( ResourceImage::New( INSERT_IMAGE ) );
     mInsertButton.SetSelectedImage( ResourceImage::New( INSERT_IMAGE_SELECTED ) );
     mInsertButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
@@ -280,7 +280,7 @@ public:
     mReplaceButton.SetParentOrigin(ParentOrigin::BOTTOM_RIGHT);
     mReplaceButton.SetAnchorPoint(AnchorPoint::BOTTOM_RIGHT);
     mReplaceButton.SetPosition( BUTTON_BORDER, BUTTON_BORDER );
-    mReplaceButton.SetDrawMode( DrawMode::OVERLAY );
+    mReplaceButton.SetDrawMode( DrawMode::OVERLAY_2D );
     mReplaceButton.SetButtonImage( ResourceImage::New( REPLACE_IMAGE ) );
     mReplaceButton.SetSelectedImage( ResourceImage::New( REPLACE_IMAGE_SELECTED ) );
     mReplaceButton.SetBackgroundImage( ResourceImage::New( TOOLBAR_IMAGE ) );
@@ -298,6 +298,7 @@ public:
     // Display item view on the stage
     stage.Add( mItemView );
+    stage.GetRootLayer().SetBehavior( Layer::LAYER_3D );
     // Create the layouts
     mSpiralLayout = DefaultItemLayout::New( DefaultItemLayout::SPIRAL );
@@ -93,7 +93,7 @@ Geometry CreateGeometry()
   // Create indices
   unsigned int indexData[10] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 0 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
   indices.SetData(indexData);
@@ -104,7 +104,7 @@ Geometry CreateGeometry()
   // Create indices
   unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, 6 );
   indices.SetData(indexData);
@@ -441,7 +441,7 @@ Geometry NewWindowController::CreateMeshGeometry()
   // Specify all the faces
   unsigned int indexData[12] = { 0,1,3,0,2,4,0,3,4,0,2,1 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, 12 );
   indices.SetData( indexData );
@@ -336,7 +336,7 @@ void RadialSweepViewImpl::CreateStencil( Radian initialSector )
   unsigned int indexData[15] = { 0,1,2,0,2,3,0,3,4,0,4,5,0,5,6 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, 15u );
   indices.SetData( indexData );
@@ -99,6 +99,9 @@ public:
     Stage stage = Stage::GetCurrent();
     Vector2 stageSize = stage.GetSize();
+    // Remove previously hidden pop-up
+    UnparentAndReset(mPopup);
+
     // Launch a pop-up containing TextField
     mField = CreateTextField( stageSize, mButtonLabel );
     mPopup = CreatePopup( stageSize.width * 0.8f );
@@ -117,6 +120,7 @@ public:
     field.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
     field.SetProperty( TextField::Property::TEXT, text );
     field.SetProperty( TextField::Property::TEXT_COLOR, Vector4( 0.0f, 1.0f, 1.0f, 1.0f ) ); // CYAN
+    field.SetProperty( TextField::Property::PRIMARY_CURSOR_COLOR, Color::WHITE );
     field.SetProperty( TextField::Property::PLACEHOLDER_TEXT, "Unnamed folder" );
     field.SetProperty( TextField::Property::PLACEHOLDER_TEXT_FOCUSED, "Enter folder name." );
     field.SetProperty( TextField::Property::DECORATION_BOUNDING_BOX, Rect<int>( BORDER_WIDTH, BORDER_WIDTH, stageSize.width - BORDER_WIDTH*2, stageSize.height - BORDER_WIDTH*2 ) );
@@ -154,7 +158,6 @@ public:
       mPopup.Hide();
     }
     mField.Reset();
-    mPopup.Reset();
   }
   bool OnPopupTouched( Actor actor, const TouchEvent& event )
@@ -107,7 +107,7 @@ 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
@@ -81,7 +81,7 @@ Geometry CreateGeometry()
   // Create indices
   unsigned int indexData[6] = { 0, 3, 1, 0, 2, 3 };
   Property::Map indexFormat;
-  indexFormat["indices"] = Property::UNSIGNED_INTEGER;
+  indexFormat["indices"] = Property::INTEGER;
   PropertyBuffer indices = PropertyBuffer::New( indexFormat, sizeof(indexData)/sizeof(indexData[0]) );
   indices.SetData(indexData);
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.48
+Version:    1.0.49
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -18,7 +18,7 @@
   "stage": [
     {
       "type": "Control",
-      "draw-mode": "OVERLAY",
+      "draw-mode": "OVERLAY_2D",
       "actors": [
         {
           "type": "Control",
@@ -19,7 +19,7 @@
     // A TextLabel with a red background
     {
       "type": "TextLabel",
-      "draw-mode": "OVERLAY",
+      "draw-mode": "OVERLAY_2D",
       "text": "Hello World",
       "parent-origin": "TOP_CENTER",
       "anchor-point": "TOP_CENTER",
@@ -44,7 +44,6 @@
       "type":"TableView",
       "background-color": [0.5,0.5,0,1],
       "parent-origin": "CENTER",
-      "draw-mode": "OVERLAY",
       "size":[400,400,1],
       "rows": 4,
       "columns": 4,
@@ -43,14 +43,33 @@ distributing this software or its derivatives.
     {
       "point-size":13
     },
-
+    "textselectionpopuplabel":
+    {
+      "point-size":18
+    },
+    "textselectionpopup":
+    {
+      "popup-max-size":[400,100],
+      "option-divider-size":[2,0],
+      "popup-divider-color":[0.23,0.72,0.8,0.11],
+      "popup-icon-color":[1.0,1.0,1.0,1.0],
+      "popup-pressed-color":[0.24,0.72,0.8,0.11],
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        }
+    },
     "textfield":
     {
       "font-family":"HelveticaNeue",
       "font-style":"Regular",
-      "point-size":18
+      "point-size":18,
+      "primary-cursor-color":[0.75,0.96,1.0,1.0],
+      "secondary-cursor-color":[1.0,0.71,0.9,1.0],
+      "selection-highlight-color":[0.75,0.96,1.0,1.0],
+      "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
+      "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
+      "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
     },
-
     "scrollview":
     {
       "overshoot-effect-color":"B018"
@@ -25,7 +25,8 @@ distributing this software or its derivatives.
     "textlabel":
     {
       "font-family":"SamsungSans",
-      "font-style":"Regular"
+      "font-style":"Regular",
+      "point-size":18
     },
     "textlabel-font-size-0":
@@ -63,11 +64,31 @@ distributing this software or its derivatives.
     {
       "point-size":10
     },
-
+    "textselectionpopuplabel":
+    {
+      "point-size":8
+    },
+    "textselectionpopup":
+    {
+      "popup-max-size":[400,100],
+      "option-divider-size":[2,0],
+      "popup-divider-color":[0.23,0.72,0.8,0.11],
+      "popup-icon-color":[1.0,1.0,1.0,1.0],
+      "popup-pressed-color":[0.24,0.72,0.8,0.11],
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        }
+    },
     "textfield":
     {
       "font-family":"SamsungSans",
-      "font-style":"Regular"
+      "font-style":"Regular",
+      "primary-cursor-color":[0.0,0.71,0.9,1.0],
+      "secondary-cursor-color":[0.0,0.71,0.9,1.0],
+      "selection-highlight-color":[0.75,0.96,1.0,1.0],
+      "grab-handle-image":"{DALI_IMAGE_DIR}cursor_handler_center.png",
+      "selection-handle-image-left":"{DALI_IMAGE_DIR}selection_handle_left.png",
+      "selection-handle-image-right":"{DALI_IMAGE_DIR}selection_handle_right.png"
     },
     "textfield-font-size-0":