Peter M. Groen / dali-demo

Commit ed4ecac98cf3df9050b88d2a59c852c46768a230

Authored by Tom Robinson
2 parents a79f0d43 9ca6b6d8

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

Change-Id: I4158037be5f4b512560da8a06ea3f1f7c35b7745
Inline Side-by-side
Showing 10 changed files with 37 additions and 45 deletions
examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
  View file @ed4ecac
... ... @@ -207,19 +207,16 @@ public:
207 207 mDesiredBox.SetParentOrigin( ParentOrigin::CENTER );
208 208 mDesiredBox.SetAnchorPoint( AnchorPoint::CENTER );
209 209 mDesiredBox.SetPosition( 0, 0, -1 );
210   - //mDesiredBox.SetSortModifier(4.f);
211 210  
212 211 mHeightBox.SetSize( stage.GetSize().width, (stage.GetSize() * mImageStageScale).height );
213 212 mHeightBox.SetParentOrigin( ParentOrigin::CENTER );
214 213 mHeightBox.SetAnchorPoint( AnchorPoint::CENTER );
215 214 mHeightBox.SetPosition( 0, 0, -1 );
216   - //mHeightBox.SetSortModifier(3.f);
217 215  
218 216 mWidthBox.SetSize( (stage.GetSize() * mImageStageScale).width, stage.GetSize().height );
219 217 mWidthBox.SetParentOrigin( ParentOrigin::CENTER );
220 218 mWidthBox.SetAnchorPoint( AnchorPoint::CENTER );
221 219 mWidthBox.SetPosition( 0, 0, -1 );
222   - //mWidthBox.SetSortModifier(2.f);
223 220  
224 221 // Make a grab-handle for resizing the image:
225 222 mGrabCorner = Toolkit::PushButton::New();
... ...
packaging/com.samsung.dali-demo.spec
  View file @ed4ecac
... ... @@ -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.50
  5 +Version: 1.0.51
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...
resources/images/spot_button_off.png
View file @ed4ecac

9.01 KB | W: | H:

8.82 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/images/spot_button_on.png
View file @ed4ecac

9.13 KB | W: | H:

8.94 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/images/spot_jelly_off.png
View file @ed4ecac

10.2 KB | W: | H:

10 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/images/spot_jelly_on.png
View file @ed4ecac

12.2 KB | W: | H:

12.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/scripts/animated-buttons.json
  View file @ed4ecac
... ... @@ -79,9 +79,9 @@
79 79 "sizeAspectRatio": false,
80 80 "visible": true,
81 81 "color": [
82   - 1,
83   - 1,
84   - 1,
  82 + 0,
  83 + 0,
  84 + 0,
85 85 1
86 86 ],
87 87 "image": {
... ... @@ -111,9 +111,9 @@
111 111 "sizeAspectRatio": false,
112 112 "visible": true,
113 113 "color": [
114   - 1,
115   - 1,
116   - 1,
  114 + 0,
  115 + 0,
  116 + 0,
117 117 1
118 118 ],
119 119 "image": {
... ... @@ -147,9 +147,9 @@
147 147 ],
148 148 "sizeAspectRatio": false,
149 149 "color": [
150   - 1,
151   - 1,
152   - 1,
  150 + 0,
  151 + 0,
  152 + 0,
153 153 1
154 154 ],
155 155 "image": {
... ... @@ -195,7 +195,7 @@
195 195 },
196 196 {
197 197 "type": "Control",
198   - "name": "Left Black",
  198 + "name": "Left Crop",
199 199 "relayout-enabled": false,
200 200 "position": [
201 201 144.5,
... ... @@ -209,9 +209,9 @@
209 209 ],
210 210 "sizeAspectRatio": false,
211 211 "background-color": [
212   - 0,
213   - 0,
214   - 0,
  212 + 1,
  213 + 1,
  214 + 1,
215 215 1
216 216 ],
217 217 "color": [
... ... @@ -224,7 +224,7 @@
224 224 },
225 225 {
226 226 "type": "Control",
227   - "name": "Right Black",
  227 + "name": "Right Crop",
228 228 "relayout-enabled": false,
229 229 "position": [
230 230 629.5,
... ... @@ -238,9 +238,9 @@
238 238 ],
239 239 "sizeAspectRatio": false,
240 240 "background-color": [
241   - 0,
242   - 0,
243   - 0,
  241 + 1,
  242 + 1,
  243 + 1,
244 244 1
245 245 ],
246 246 "color": [
... ... @@ -427,7 +427,7 @@
427 427 "timelineColor": "#b0e8f9"
428 428 },
429 429 {
430   - "actor": "Left Black",
  430 + "actor": "Left Crop",
431 431 "property": "position",
432 432 "value": [
433 433 144.5,
... ... @@ -457,7 +457,7 @@
457 457 "timelineColor": "#a2cfea"
458 458 },
459 459 {
460   - "actor": "Right Black",
  460 + "actor": "Right Crop",
461 461 "property": "position",
462 462 "value": [
463 463 629.5,
... ... @@ -627,7 +627,7 @@
627 627 "timelineColor": "#b0e8f9"
628 628 },
629 629 {
630   - "actor": "Left Black",
  630 + "actor": "Left Crop",
631 631 "property": "position",
632 632 "value": [
633 633 -95,
... ... @@ -657,7 +657,7 @@
657 657 "timelineColor": "#a2cfea"
658 658 },
659 659 {
660   - "actor": "Right Black",
  660 + "actor": "Right Crop",
661 661 "property": "position",
662 662 "value": [
663 663 383,
... ...
resources/scripts/animated-colors.json
  View file @ed4ecac
... ... @@ -18,7 +18,6 @@
18 18 "stage": [
19 19 {
20 20 "type": "Control",
21   - "draw-mode": "OVERLAY_2D",
22 21 "actors": [
23 22 {
24 23 "type": "Control",
... ...
resources/scripts/button.json
  View file @ed4ecac
... ... @@ -26,12 +26,9 @@
26 26 "anchor-point": "TOP_CENTER",
27 27 "position": [0, 0, 0],
28 28 "size": [400, 200, 0],
29   - "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
30   - "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
31   - "label-actor": {
32   - "type": "TextLabel",
33   - "text": "Normal"
34   - }
  29 + "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  30 + "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",
  31 + "label-text": "Normal"
35 32 },
36 33  
37 34 // Second Button
... ... @@ -41,14 +38,11 @@
41 38 "anchor-point": "CENTER",
42 39 "position": [0, 0, 0],
43 40 "size": [400, 200, 0],
44   - "label-actor": {
45   - "type": "TextLabel",
46   - "text": "Disabled"
47   - },
48 41 "disabled": true,
49   - "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
50   - "selected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-2.png",
51   - "disabled-state-actor": "{DALI_IMAGE_DIR}blocks-brick-3.png"
  42 + "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  43 + "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-2.png",
  44 + "disabled-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",
  45 + "label-text": "Disabled"
52 46 },
53 47  
54 48 // Third Button
... ... @@ -59,13 +53,10 @@
59 53 "anchor-point": "BOTTOM_CENTER",
60 54 "position": [0, 0, 0],
61 55 "size": [400, 200, 0],
62   - "label-actor": {
63   - "type": "TextLabel",
64   - "text": "Toggle"
65   - },
66 56 "togglable": true,
67   - "unselected-state-actor": "{DALI_IMAGE_DIR}blocks-brick-1.png",
68   - "selected-state-actor": "{DALI_IMAGE_DIR}blocks-paddle.png",
  57 + "unselected-state-image": "{DALI_IMAGE_DIR}blocks-brick-1.png",
  58 + "selected-state-image": "{DALI_IMAGE_DIR}blocks-brick-3.png",
  59 + "label-text": "Toggle",
69 60 "signals": [{
70 61 "name": "selected",
71 62 "action": "set",
... ...
resources/scripts/timing.json
  View file @ed4ecac
... ... @@ -14,6 +14,10 @@
14 14 },
15 15 "stage": [
16 16 {
  17 + "type": "Actor",
  18 + "parent-origin": "CENTER",
  19 + "anchor-point": "CENTER",
  20 + "actors": [{
17 21 "type": "color-control",
18 22 "name": "Container 1",
19 23 "position": [
... ... @@ -84,6 +88,7 @@
84 88 55,
85 89 0
86 90 ]
  91 + }]
87 92 },
88 93 {
89 94 "type": "Control",
... ...