Peter M. Groen / dali-demo

Commit b73149dfa1530bab210be84de4c69cbe6f2e0d14

Authored by Francisco Santos
2 parents b8abf2a0 8a5c094d

Merge branch 'devel/master' into devel/new_mesh 

Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf
Inline Side-by-side
Showing 5 changed files with 64 additions and 35 deletions
examples/cluster/cluster-impl.cpp
  View file @b73149d
... ... @@ -540,15 +540,15 @@ void Cluster::DoTransformAction(const Property::Map& attributes)
540 540  
541 541 if( Property::VECTOR3 == type && "position" == stringValue.first )
542 542 {
543   - stringValue.second.Get(position);
  543 + stringValue.second.Get( position );
544 544 }
545 545 else if( Property::VECTOR3 == type && "scale" == stringValue.first )
546 546 {
547   - stringValue.second.Get(scale);
  547 + stringValue.second.Get( scale );
548 548 }
549 549 else if( "rotation" == stringValue.first )
550 550 {
551   - (void)Scripting::SetRotation(stringValue.second, rotation);
  551 + stringValue.second.Get( rotation );
552 552 }
553 553 }
554 554  
... ...
examples/magnifier/magnifier-example.cpp
  View file @b73149d
... ... @@ -225,7 +225,7 @@ public:
225 225 mMagnifier = Toolkit::Magnifier::New();
226 226 mMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
227 227 mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
228   - mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
  228 + mMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
229 229 mMagnifier.SetScale(Vector3::ZERO);
230 230 overlay.Add( mMagnifier );
231 231  
... ... @@ -242,7 +242,7 @@ public:
242 242 mBouncingMagnifier = Toolkit::Magnifier::New();
243 243 mBouncingMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
244 244 mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
245   - mBouncingMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR );
  245 + mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
246 246 overlay.Add( mBouncingMagnifier );
247 247  
248 248 mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f);
... ... @@ -255,7 +255,7 @@ public:
255 255 constraint.Apply();
256 256  
257 257 // Apply constraint to animate the source of the magnifier.
258   - constraint = Constraint::New<Vector3>( mBouncingMagnifier, mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ), MagnifierPathConstraint(mStageSize) );
  258 + constraint = Constraint::New<Vector3>( mBouncingMagnifier, Toolkit::Magnifier::Property::SOURCE_POSITION, MagnifierPathConstraint(mStageSize) );
259 259 constraint.AddSource( LocalSource(Actor::Property::SIZE) );
260 260 constraint.AddSource( LocalSource(mAnimationTimeProperty) );
261 261 constraint.Apply();
... ... @@ -368,7 +368,7 @@ public:
368 368 */
369 369 void SetMagnifierPosition(const Vector3 position)
370 370 {
371   - mMagnifier.SetSourcePosition( position );
  371 + mMagnifier.SetProperty( Toolkit::Magnifier::Property::SOURCE_POSITION, position );
372 372  
373 373 // position magnifier glass such that bottom edge is touching/near top of finger.
374 374 Vector3 glassPosition(position);
... ...
packaging/com.samsung.dali-demo.spec
  View file @b73149d
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.0.43
  5 +Version: 1.0.46
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ... @@ -21,7 +21,6 @@ BuildRequires: pkgconfig(capi-media-player)
21 21 BuildRequires: dali-toolkit-devel
22 22 BuildRequires: dali-adaptor-devel
23 23 BuildRequires: pkgconfig(dlog)
24   -BuildRequires: pkgconfig(egl)
25 24 BuildRequires: gettext-tools
26 25  
27 26 %description
... ...
resources/scripts/background-color.json
  View file @b73149d
... ... @@ -47,9 +47,7 @@
47 47 "anchor-point": "TOP_CENTER",
48 48 "size": [400, 150, 1],
49 49 "background-image": {
50   - "image": {
51   - "filename": "{DALI_IMAGE_DIR}button-background.png"
52   - }
  50 + "filename": "{DALI_IMAGE_DIR}button-background.png"
53 51 }
54 52 },
55 53  
... ... @@ -62,9 +60,7 @@
62 60 "size": [400, 150, 1],
63 61 "background-color": [0, 0, 1, 1],
64 62 "background-image": {
65   - "image": {
66   - "filename": "{DALI_IMAGE_DIR}button-background.png"
67   - }
  63 + "filename": "{DALI_IMAGE_DIR}button-background.png"
68 64 }
69 65 }
70 66 ]
... ...
resources/scripts/table-view.json
  View file @b73149d
1 1 /*
2   - * Copyright (c) 2014 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2015 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -16,70 +16,104 @@
16 16 */
17 17 {
18 18 // a tree of actors
  19 + /*
  20 + * 4 by 4 table:
  21 + * |------------------------------------|
  22 + * | | 2(right,top)| | |
  23 + * | - - - |----------------|---|----|
  24 + * | | | | |
  25 + * | | | | |
  26 + * | | | | |
  27 + * | - - - | - - - - - |--------|
  28 + * | | | | |
  29 + * | 1 | | | |
  30 + * | | 3 | 4 | |
  31 + * | |aligned to | | |
  32 + * | |(left, center) | | |
  33 + * | - - - | - - - - - |--------|
  34 + * | | | ' |
  35 + * | | | ' |
  36 + * | | | 5 |
  37 + * | | | ' |
  38 + * | | | ' |
  39 + * |------------------------------------|
  40 + */
  41 +
19 42 "stage": [{
20 43 "name":"simple-table",
21 44 "type":"TableView",
22 45 "background-color": [0.5,0.5,0,1],
23 46 "parent-origin": "CENTER",
24 47 "draw-mode": "OVERLAY",
25   - "size":[400,500,1],
  48 + "size":[400,400,1],
  49 + "rows": 4,
  50 + "columns": 4,
26 51 "cell-padding": [10, 5],
27 52 "layout-rows": { // set the height of the rows
28 53 "0": { "policy": "fixed", "value": 40 },
29 54 "1": { "policy": "relative", "value": 0.33 },
30   - "2": { "policy": "fixed", "value": 120 }
  55 + "2": { "policy": "fit", "value": 0 }
31 56 },
32 57 "layout-columns": { // set the widths of the columns
33   - "1": { "policy": "fixed", "value": 150 },
34   - "2": { "policy": "relative", "value": 0.35 },
35   - "3": { "policy": "relative", "value": 0.15 }
  58 + "0": { "policy": "fit", "value": 0 },
  59 + "2": { "policy": "relative", "value": 0.2 },
  60 + "3": { "policy": "fixed", "value": 30 }
36 61 },
37 62 "actors": [{
38 63 "name":"gallery-1",
39 64 "type":"ImageActor",
40   - "width-resize-policy":"FILL_TO_PARENT",
41 65 "height-resize-policy":"FILL_TO_PARENT",
42 66 "image": {
43   - "filename": "{DALI_IMAGE_DIR}gallery-large-1.jpg"
  67 + "filename": "{DALI_IMAGE_DIR}gallery-small-1.jpg"
44 68 },
45 69 "custom-properties": { // properties registered dynamically
46   - "cell-indices": [0,0], // property to specify the top-left cell this child occupies
  70 + "cell-index": [0,0], // property to specify the top-left cell this child occupies
47 71 "row-span":4, // property to specify how many rows this child occupies, if not set, default value is 1
48 72 "column-span":1 // property to specify how many columns this child occupies, if nor set, defualt cvalue is 1
49 73 }
50 74 },{
51 75 "name":"gallery-2",
52 76 "type":"ImageActor",
53   - "width-resize-policy":"FILL_TO_PARENT",
54 77 "height-resize-policy":"FILL_TO_PARENT",
55 78 "image": {
56   - "filename": "{DALI_IMAGE_DIR}gallery-large-2.jpg"
  79 + "filename": "{DALI_IMAGE_DIR}gallery-small-2.jpg"
  80 + },
  81 + "custom-properties": { // properties registered dynamically
  82 + "cell-index": [0,1],
  83 + "cell-horizontal-alignment": "right" // property to specify how to align horizontally inside the cells, if not set, default value is 'left'
  84 + }
  85 + },{
  86 + "name":"gallery-3",
  87 + "type":"ImageActor",
  88 + "image": {
  89 + "filename": "{DALI_IMAGE_DIR}gallery-small-3.jpg"
57 90 },
58 91 "custom-properties": {
59   - "cell-indices":[1,1],
60   - "row-span":3
  92 + "cell-index":[1,1],
  93 + "row-span":3,
  94 + "cell-horizontal-alignment": "left",// property to specify how to align horizontally inside the cells, if not set, default value is 'left'
  95 + "cell-vertical-alignment": "center" // property to specify how to align vertically inside the cells, if not set, default value is 'top'
61 96 }
62 97 }, {
63   - "name":"gallery-3",
  98 + "name":"gallery-4",
64 99 "type":"ImageActor",
65 100 "width-resize-policy":"FILL_TO_PARENT",
66   - "height-resize-policy":"FILL_TO_PARENT",
67 101 "image": {
68   - "filename": "{DALI_IMAGE_DIR}gallery-large-3.jpg"
  102 + "filename": "{DALI_IMAGE_DIR}gallery-small-4.jpg"
69 103 },
70 104 "custom-properties": {
71   - "cell-indices":[2,2]
  105 + "cell-index":[2,2]
72 106 }
73 107 }, {
74   - "name":"gallery-4",
  108 + "name":"gallery-5",
75 109 "type":"ImageActor",
76 110 "width-resize-policy":"FILL_TO_PARENT",
77 111 "height-resize-policy":"FILL_TO_PARENT",
78 112 "image": {
79   - "filename": "{DALI_IMAGE_DIR}gallery-large-4.jpg"
  113 + "filename": "{DALI_IMAGE_DIR}gallery-small-5.jpg"
80 114 },
81 115 "custom-properties": {
82   - "cell-indices":[3,2],
  116 + "cell-index":[3,2],
83 117 "column-span": 2
84 118 }
85 119 }]
... ...