Merge branch 'devel/master' into devel/new_mesh

Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf

Merge branch 'devel/master' into devel/new_mesh
Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf
Francisco Santos
2 parents b8abf2a0 8a5c094d
Showing 5 changed files with 64 additions and 35 deletions
examples/cluster/cluster-impl.cpp
examples/magnifier/magnifier-example.cpp
packaging/com.samsung.dali-demo.spec
resources/scripts/background-color.json
resources/scripts/table-view.json
@@ -540,15 +540,15 @@ void Cluster::DoTransformAction(const Property::Map&amp; attributes)
     if( Property::VECTOR3 == type && "position" == stringValue.first )
     {
-      stringValue.second.Get(position);
+      stringValue.second.Get( position );
     }
     else if( Property::VECTOR3 == type && "scale" == stringValue.first )
     {
-      stringValue.second.Get(scale);
+      stringValue.second.Get( scale );
     }
     else if( "rotation" == stringValue.first )
     {
-      (void)Scripting::SetRotation(stringValue.second, rotation);
+      stringValue.second.Get( rotation );
     }
   }
@@ -225,7 +225,7 @@ public:
     mMagnifier = Toolkit::Magnifier::New();
     mMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
     mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width );  // Size of magnifier is in relation to stage width
-    mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
+    mMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
     mMagnifier.SetScale(Vector3::ZERO);
     overlay.Add( mMagnifier );
@@ -242,7 +242,7 @@ public:
     mBouncingMagnifier = Toolkit::Magnifier::New();
     mBouncingMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
     mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
-    mBouncingMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
+    mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
     overlay.Add( mBouncingMagnifier );
     mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f);
@@ -255,7 +255,7 @@ public:
     constraint.Apply();
     // Apply constraint to animate the source of the magnifier.
-    constraint = Constraint::New<Vector3>( mBouncingMagnifier, mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ), MagnifierPathConstraint(mStageSize) );
+    constraint = Constraint::New<Vector3>( mBouncingMagnifier, Toolkit::Magnifier::Property::SOURCE_POSITION, MagnifierPathConstraint(mStageSize) );
     constraint.AddSource( LocalSource(Actor::Property::SIZE) );
     constraint.AddSource( LocalSource(mAnimationTimeProperty) );
     constraint.Apply();
@@ -368,7 +368,7 @@ public:
    */
   void SetMagnifierPosition(const Vector3 position)
   {
-    mMagnifier.SetSourcePosition( position );
+    mMagnifier.SetProperty( Toolkit::Magnifier::Property::SOURCE_POSITION, position );
     // position magnifier glass such that bottom edge is touching/near top of finger.
     Vector3 glassPosition(position);
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.43
+Version:    1.0.46
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -21,7 +21,6 @@ BuildRequires:  pkgconfig(capi-media-player)
 BuildRequires:  dali-toolkit-devel
 BuildRequires:  dali-adaptor-devel
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(egl)
 BuildRequires:  gettext-tools
 %description
@@ -47,9 +47,7 @@
       "anchor-point": "TOP_CENTER",
       "size": [400, 150, 1],
       "background-image": {
-        "image": {
-          "filename": "{DALI_IMAGE_DIR}button-background.png"
-        }
+        "filename": "{DALI_IMAGE_DIR}button-background.png"
       }
     },
@@ -62,9 +60,7 @@
       "size": [400, 150, 1],
       "background-color": [0, 0, 1, 1],
       "background-image": {
-        "image": {
-          "filename": "{DALI_IMAGE_DIR}button-background.png"
-        }
+        "filename": "{DALI_IMAGE_DIR}button-background.png"
       }
     }
   ]
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,70 +16,104 @@
  */
 {
   // a tree of actors
+  /*
+   *  4 by 4 table:
+   * |------------------------------------|
+   * |          |    2(right,top)|   |    |
+   * |  -  -  - |----------------|---|----|
+   * |          |                |   |    |
+   * |          |                |   |    |
+   * |          |                |   |    |
+   * |  -  -  - |  -  -  -  -  - |--------|
+   * |          |                |   |    |
+   * |    1     |                |   |    |
+   * |          |  3             | 4 |    |
+   * |          |aligned to      |   |    |
+   * |          |(left, center)  |   |    |
+   * |  -  -  - |  -  -  -  -  - |--------|
+   * |          |                |   '    |
+   * |          |                |   '    |
+   * |          |                |   5    |
+   * |          |                |   '    |
+   * |          |                |   '    |
+   * |------------------------------------|
+  */
+
   "stage": [{
       "name":"simple-table",
       "type":"TableView",
       "background-color": [0.5,0.5,0,1],
       "parent-origin": "CENTER",
       "draw-mode": "OVERLAY",
-      "size":[400,500,1],
+      "size":[400,400,1],
+      "rows": 4,
+      "columns": 4,
       "cell-padding": [10, 5],
       "layout-rows": {  // set the height of the rows
         "0": { "policy": "fixed", "value": 40 },
         "1": { "policy": "relative", "value": 0.33 },
-        "2": { "policy": "fixed", "value": 120 }
+        "2": { "policy": "fit", "value": 0 }
       },
       "layout-columns": { // set the widths of the columns
-        "1": { "policy": "fixed", "value": 150 },
-        "2": { "policy": "relative", "value": 0.35 },
-        "3": { "policy": "relative", "value": 0.15 }
+        "0": { "policy": "fit", "value": 0 },
+        "2": { "policy": "relative", "value": 0.2 },
+        "3": { "policy": "fixed", "value": 30 }
       },
       "actors": [{
           "name":"gallery-1",
           "type":"ImageActor",
-          "width-resize-policy":"FILL_TO_PARENT",
           "height-resize-policy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-1.jpg"
+            "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg"
           },
           "custom-properties": { // properties registered dynamically
-            "cell-indices": [0,0], // property to specify the top-left cell this child occupies
+            "cell-index": [0,0], // property to specify the top-left cell this child occupies
             "row-span":4, // property to specify how many rows this child occupies, if not set, default value is 1
             "column-span":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1
           }
         },{
           "name":"gallery-2",
           "type":"ImageActor",
-          "width-resize-policy":"FILL_TO_PARENT",
           "height-resize-policy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-2.jpg"
+            "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg"
+          },
+          "custom-properties": { // properties registered dynamically
+            "cell-index": [0,1],
+            "cell-horizontal-alignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left'
+          }
+        },{
+          "name":"gallery-3",
+          "type":"ImageActor",
+          "image": {
+            "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg"
           },
           "custom-properties": {
-            "cell-indices":[1,1],
-            "row-span":3
+            "cell-index":[1,1],
+            "row-span":3,
+            "cell-horizontal-alignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left'
+            "cell-vertical-alignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top'
           }
         }, {
-          "name":"gallery-3",
+          "name":"gallery-4",
           "type":"ImageActor",
           "width-resize-policy":"FILL_TO_PARENT",
-          "height-resize-policy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-3.jpg"
+            "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg"
           },
           "custom-properties": {
-            "cell-indices":[2,2]
+            "cell-index":[2,2]
           }
         }, {
-          "name":"gallery-4",
+          "name":"gallery-5",
           "type":"ImageActor",
           "width-resize-policy":"FILL_TO_PARENT",
           "height-resize-policy":"FILL_TO_PARENT",
           "image": {
-            "filename": "{DALI_IMAGE_DIR}gallery-large-4.jpg"
+            "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg"
           },
           "custom-properties": {
-            "cell-indices":[3,2],
+            "cell-index":[3,2],
             "column-span": 2
           }
         }]