Peter M. Groen / dali-demo

Commit 2fae12d2df16eb606100d9eafaa86ab13a67aece

Authored by adam.b
2 parents d23f9bc5 8fc654d4

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

Change-Id: Id8932bc211348513f9033267033e06e2e2aff6ad
Inline Side-by-side
Showing 15 changed files with 753 additions and 441 deletions
build/tizen/CMakeLists.txt
  View file @2fae12d
... ... @@ -109,7 +109,10 @@ ENDFOREACH(flag)
109 109 CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp )
110 110  
111 111 #Replace @DEMO_STYLE_IMAGE_DIR@ in following files
  112 +CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/base-theme.json.in ${LOCAL_STYLE_DIR}/base-theme.json )
112 113 CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json )
  114 +CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/examples-theme.json.in ${LOCAL_STYLE_DIR}/examples-theme.json )
  115 +CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tests-theme.json.in ${LOCAL_STYLE_DIR}/tests-theme.json )
113 116 CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json.in ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json )
114 117 CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json.in ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json )
115 118 CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json.in ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json )
... ...
examples-reel/dali-examples-reel.cpp
  View file @2fae12d
... ... @@ -31,7 +31,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
31 31 textdomain(DALI_DEMO_DOMAIN_LOCAL);
32 32 setlocale(LC_ALL, DEMO_LANG);
33 33  
34   - Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
  34 + Application app = Application::New( &argc, &argv, DEMO_STYLE_DIR "/examples-theme.json" );
35 35  
36 36 // Create the demo launcher
37 37 DaliTableView demo(app);
... ...
packaging/com.samsung.dali-demo.spec
  View file @2fae12d
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.4.38
  5 +Version: 1.4.39
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...
resources/scripts/simple-image-wall.js.in deleted
View file @d23f9bc
1   -// Image Wall example
2   -//
3   -// Example usage of Dali API
4   -//
5   -
6   -var imageDir = "@DEMO_STYLE_IMAGE_DIR@";
7   -
8   -var NUMBER_OF_IMAGES = 40; // for now use 16 ( demo files go up to 30)
9   -var VIDEO_WALL_ROWS = 7; // use 3 rows for the video wall
10   -var VIDEO_WALL_COLUMNS = 12; // use 12 columns for the video wall
11   -var VIDEO_WALL_ITEM_SIZE = 128; // width / height of a item in the video wall
12   -var BORDER_SIZE = 5;
13   -var VIDEO_WALL_ITEM_SIZE_NO_BORDER = VIDEO_WALL_ITEM_SIZE - BORDER_SIZE;
14   -var VIDEO_WALL_WIDTH = VIDEO_WALL_COLUMNS * VIDEO_WALL_ITEM_SIZE;
15   -var VIDEO_WALL_HEIGHT = VIDEO_WALL_ROWS * VIDEO_WALL_ITEM_SIZE;
16   -
17   -var daliApp = {};
18   -
19   -var wallRootActor; // the root actor of the video wall
20   -
21   -// we want demo images of format gallery-small-1.jpg
22   -daliApp.getFileName = function(index) {
23   - fileName = "gallery-small-" + (index+1) + ".jpg";
24   - return fileName;
25   -}
26   -
27   -daliApp.createRootActor = function() {
28   - wallRootActor = new dali.Actor();
29   - wallRootActor.parentOrigin = dali.CENTER;
30   - wallRootActor.anchorPoint = dali.CENTER;
31   - dali.stage.add(wallRootActor);
32   -}
33   -
34   -daliApp.getWallActorIndex = function(x, y) {
35   - return x + y * VIDEO_WALL_COLUMNS;
36   -}
37   -
38   -daliApp.createActors = function() {
39   - daliApp.createRootActor();
40   -
41   - for (y = 0; y < VIDEO_WALL_ROWS; ++y) {
42   - for (x = 0; x < VIDEO_WALL_COLUMNS; ++x) {
43   -
44   - var actorIndex = daliApp.getWallActorIndex(x, y);
45   - var imageView = new dali.Control("ImageView");
46   -
47   - // wrap image index between 0 and NUMBER_OF_IMAGES
48   - var imageIndex = actorIndex % NUMBER_OF_IMAGES;
49   -
50   - imageView.image = imageDir + daliApp.getFileName(imageIndex);
51   -
52   - imageView.parentOrigin = dali.CENTER;
53   - imageView.anchorPoint = dali.CENTER;
54   - imageView.size = [VIDEO_WALL_ITEM_SIZE_NO_BORDER, VIDEO_WALL_ITEM_SIZE_NO_BORDER, 1.0]; // start with zero size so it zooms up
55   -
56   - var xPosition = x * VIDEO_WALL_ITEM_SIZE;
57   - // as the middle the wall is at zero (relative to wallRootActor), we need to subtract half the wall width.
58   - // + add half item size because the item anchor point is the center of the wallRootActor.
59   - xPosition = xPosition - (VIDEO_WALL_WIDTH / 2) + (VIDEO_WALL_ITEM_SIZE / 2);
60   -
61   - var yPosition = y * VIDEO_WALL_ITEM_SIZE;
62   - yPosition = yPosition - (VIDEO_WALL_HEIGHT / 2) + (VIDEO_WALL_ITEM_SIZE / 2);
63   -
64   - imageView.position = [xPosition, yPosition, 0.0];
65   -
66   - // Add to the video wall root actor.
67   - wallRootActor.add(imageView);
68   - }
69   - }
70   -}
71   -
72   -function Initialise() {
73   - daliApp.createActors();
74   -}
75   -
76   -Initialise();
resources/style/.gitignore
  View file @2fae12d
  1 +base-theme.json
1 2 demo-theme.json
  3 +examples-theme.json
  4 +tests-theme.json
2 5 animated-gradient-call-active-style.json
3 6 contact-cards-example-theme.json
4 7 progress-bar-example-theme.json
... ...
resources/style/base-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "styles":
  20 + {
  21 + "ConfirmationPopup":{
  22 + "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/00_popup_bg.9.png"
  23 + },
  24 +
  25 + "CustomPopupStyle":{
  26 + "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/popup.9.png",
  27 + "popupBackgroundBorder":[0,4,4,0],
  28 + "tailUpImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-up.png",
  29 + "tailDownImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-down.png",
  30 + "tailLeftImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-left.png",
  31 + "tailRightImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-right.png"
  32 + },
  33 +
  34 + "DemoTileBase":
  35 + {
  36 + "states":
  37 + {
  38 + "NORMAL":
  39 + {
  40 + "color":[0.4, 0.6, 0.9, 0.6],
  41 + "visuals":
  42 + {
  43 + "image":
  44 + {
  45 + "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture.9.png",
  46 +// TILE_BACKGROUND_ALPHA
  47 +// This shader takes a texture.
  48 +// An alpha discard is performed.
  49 +// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
  50 + "shader":
  51 + {
  52 + "fragmentShader":[
  53 + " varying mediump vec2 vTexCoord;",
  54 + " uniform lowp vec4 uColor;",
  55 + " uniform sampler2D sTexture;",
  56 + " uniform mediump vec3 uCustomPosition;",
  57 + "",
  58 + " void main()",
  59 + " {",
  60 + " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
  61 + " {",
  62 + " discard;",
  63 + " }",
  64 + "",
  65 + " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
  66 + " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
  67 + " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
  68 + "",
  69 + " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
  70 + " }"
  71 + ]
  72 + }
  73 + }
  74 + }
  75 + },
  76 + "FOCUSED":
  77 + {
  78 + "color":[0.3, 0.5, 0.8, 0.5],
  79 + "visuals":
  80 + {
  81 + "image":
  82 + {
  83 + "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture-focused.9.png",
  84 +// TILE_BACKGROUND_ALPHA
  85 +// This shader takes a texture.
  86 +// An alpha discard is performed.
  87 +// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
  88 + "shader":
  89 + {
  90 + "fragmentShader":[
  91 + " varying mediump vec2 vTexCoord;",
  92 + " uniform lowp vec4 uColor;",
  93 + " uniform sampler2D sTexture;",
  94 + " uniform mediump vec3 uCustomPosition;",
  95 + "",
  96 + " void main()",
  97 + " {",
  98 + " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
  99 + " {",
  100 + " discard;",
  101 + " }",
  102 + "",
  103 + " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
  104 + " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
  105 + " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
  106 + "",
  107 + " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
  108 + " }"
  109 + ]
  110 + }
  111 + }
  112 + }
  113 + }
  114 + }
  115 + },
  116 + "FocusActor":
  117 + {
  118 + "visuals":
  119 + {
  120 + "image":
  121 + {
  122 + "url":"{APPLICATION_RESOURCE_PATH}/images/tile-focus.9.png"
  123 + }
  124 + }
  125 + },
  126 + "DemoTileBorder":
  127 + {
  128 + "visuals":
  129 + {
  130 + "image":
  131 + {
  132 + "url":"{APPLICATION_RESOURCE_PATH}/images/item-background.9.png" // TILE_BACKGROUND
  133 + }
  134 + }
  135 + },
  136 + "TextLabelRosemary":
  137 + {
  138 + "fontFamily":"Rosemary"
  139 + },
  140 + "TextLabel":
  141 + {
  142 + "fontStyle":{"weight":"normal"},
  143 + "pointSize":18
  144 + },
  145 + "LauncherLabel":
  146 + {
  147 + "pointSize":18
  148 + },
  149 +
  150 + "ToolbarLabel":
  151 + {
  152 + "pointSize":18
  153 + },
  154 +
  155 + "BuilderLabel":
  156 + {
  157 + "pointSize":13
  158 + },
  159 +
  160 + "ScrollView":
  161 + {
  162 + "overshootEffectColor":"B018"
  163 + },
  164 +
  165 + "ImageScalingGroupLabel":
  166 + {
  167 + "pointSize":9
  168 + },
  169 +
  170 + "ImageScalingButton":
  171 + {
  172 + "label":{
  173 + "pointSize":11
  174 + }
  175 + },
  176 +//
  177 +// Simple Visuals Application Style section
  178 +//
  179 + "MyControl":
  180 + {
  181 + "states":
  182 + {
  183 + "NORMAL":
  184 + {
  185 + "visuals":
  186 + {
  187 + "iconVisual":
  188 + {
  189 + "url":"{APPLICATION_RESOURCE_PATH}/images/application-icon-13.png"
  190 + }
  191 + }
  192 + },
  193 + "FOCUSED":
  194 + {
  195 + "visuals":
  196 + {
  197 + "iconVisual":
  198 + {
  199 + "url":"{APPLICATION_RESOURCE_PATH}/images/application-icon-83.png"
  200 + }
  201 + }
  202 + }
  203 + }
  204 + }
  205 + }
  206 +}
... ...
resources/style/demo-theme.json.in
  View file @2fae12d
1 1 /*
2   - * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  3 + *
3 4 * Licensed under the Apache License, Version 2.0 (the "License");
4 5 * you may not use this file except in compliance with the License.
5 6 * You may obtain a copy of the License at
... ... @@ -15,203 +16,49 @@
15 16 */
16 17  
17 18 {
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
18 24 "styles":
19 25 {
20   - "ConfirmationPopup":{
21   - "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/00_popup_bg.9.png"
22   - },
23   -
24   - "CustomPopupStyle":{
25   - "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/popup.9.png",
26   - "popupBackgroundBorder":[0,4,4,0],
27   - "tailUpImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-up.png",
28   - "tailDownImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-down.png",
29   - "tailLeftImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-left.png",
30   - "tailRightImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-right.png"
31   - },
32   -
33 26 "DemoTile":
34 27 {
35   - "states":
36   - {
37   - "NORMAL":
38   - {
39   - "color":[0.4, 0.6, 0.9, 0.6],
40   - "visuals":
41   - {
42   - "image":
43   - {
44   - "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture.9.png",
45   -// TILE_BACKGROUND_ALPHA
46   -// This shader takes a texture.
47   -// An alpha discard is performed.
48   -// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
49   - "shader":
50   - {
51   - "fragmentShader":[
52   - " varying mediump vec2 vTexCoord;",
53   - " uniform lowp vec4 uColor;",
54   - " uniform sampler2D sTexture;",
55   - " uniform mediump vec3 uCustomPosition;",
56   - "",
57   - " void main()",
58   - " {",
59   - " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
60   - " {",
61   - " discard;",
62   - " }",
63   - "",
64   - " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
65   - " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
66   - " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
67   - "",
68   - " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
69   - " }"
70   - ]
71   - }
72   - }
73   - }
74   - },
75   - "FOCUSED":
76   - {
77   - "color":[0.3, 0.5, 0.8, 0.5],
78   - "visuals":
79   - {
80   - "image":
81   - {
82   - "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture-focused.9.png",
83   -// TILE_BACKGROUND_ALPHA
84   -// This shader takes a texture.
85   -// An alpha discard is performed.
86   -// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
87   - "shader":
88   - {
89   - "fragmentShader":[
90   - " varying mediump vec2 vTexCoord;",
91   - " uniform lowp vec4 uColor;",
92   - " uniform sampler2D sTexture;",
93   - " uniform mediump vec3 uCustomPosition;",
94   - "",
95   - " void main()",
96   - " {",
97   - " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
98   - " {",
99   - " discard;",
100   - " }",
101   - "",
102   - " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
103   - " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
104   - " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
105   - "",
106   - " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
107   - " }"
108   - ]
109   - }
110   - }
111   - }
112   - }
113   - }
114   - },
115   - "FocusActor":
116   - {
117   - "visuals":
118   - {
119   - "image":
120   - {
121   - "url":"{APPLICATION_RESOURCE_PATH}/images/tile-focus.9.png"
122   - }
123   - }
  28 + "styles":[ "DemoTileBase" ]
124 29 },
125   - "DemoTileBorder":
  30 +
  31 + "LauncherBackground":
126 32 {
127   - "visuals":
  33 + "background":
128 34 {
129   - "image":
130   - {
131   - "url":"{APPLICATION_RESOURCE_PATH}/images/item-background.9.png" // TILE_BACKGROUND
132   - }
  35 + "visualType": "GRADIENT",
  36 + "center": [240, 400],
  37 + "radius": 932,
  38 + "units": "USER_SPACE",
  39 + "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
133 40 }
134 41 },
135   - "TextLabelRosemary":
136   - {
137   - "fontFamily":"Rosemary"
138   - },
139   - "TextLabel":
140   - {
141   - "fontStyle":{"weight":"normal"},
142   - "pointSize":18
143   - },
144   - "LauncherLabel":
145   - {
146   - "pointSize":18
147   - },
148   -
149   - "ToolbarLabel":
150   - {
151   - "pointSize":18
152   - },
153   -
154   - "BuilderLabel":
155   - {
156   - "pointSize":13
157   - },
158 42  
159   - "ScrollView":
  43 + "BubbleColor1":
160 44 {
161   - "overshootEffectColor":"B018"
  45 + "color": [ 0.3255, 0.3412, 0.6353, 0.32 ]
162 46 },
163 47  
164   - "ImageScalingGroupLabel":
  48 + "BubbleColor2":
165 49 {
166   - "pointSize":9
  50 + "color": [ 0.3647, 0.7569, 0.8157, 0.32 ]
167 51 },
168 52  
169   - "ImageScalingButton":
  53 + "BubbleColor3":
170 54 {
171   - "label":{
172   - "pointSize":11
173   - }
  55 + "color": [ 0.3804, 0.7412, 0.6510, 0.32 ]
174 56 },
175 57  
176   - "LauncherBackground":
  58 + "BubbleColor4":
177 59 {
178   - "background":
179   - {
180   - "visualType": "GRADIENT",
181   - "center": [240, 400],
182   - "radius": 932,
183   - "units": "USER_SPACE",
184   - "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
185   - }
186   - },
187   -//
188   -// Simple Visuals Application Style section
189   -//
190   - "MyControl":
191   - {
192   - "states":
193   - {
194   - "NORMAL":
195   - {
196   - "visuals":
197   - {
198   - "iconVisual":
199   - {
200   - "url":"{APPLICATION_RESOURCE_PATH}/images/application-icon-13.png"
201   - }
202   - }
203   - },
204   - "FOCUSED":
205   - {
206   - "visuals":
207   - {
208   - "iconVisual":
209   - {
210   - "url":"{APPLICATION_RESOURCE_PATH}/images/application-icon-83.png"
211   - }
212   - }
213   - }
214   - }
  60 + "color": [ 1, 1, 1, 0.13 ]
215 61 }
  62 +
216 63 }
217 64 }
... ...
resources/style/examples-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
  24 + "styles":
  25 + {
  26 + "DemoTile":
  27 + {
  28 + "styles": ["DemoTileBase"],
  29 + "states":
  30 + {
  31 + "NORMAL":
  32 + {
  33 + "color":[0.9, 0.4, 0.4, 0.6]
  34 + }
  35 + }
  36 + },
  37 +
  38 + "LauncherBackground":
  39 + {
  40 + "background":
  41 + {
  42 + "visualType": "GRADIENT",
  43 + "center": [240, 400],
  44 + "radius": 932,
  45 + "units": "USER_SPACE",
  46 + "stopColor": [[0,0,0,1.0],[0.556863,0.054902,0,1.0]]
  47 + }
  48 + },
  49 +
  50 + "BubbleColor1":
  51 + {
  52 + "color": [ 0.8255, 0.2412, 0.1353, 0.32 ]
  53 + },
  54 +
  55 + "BubbleColor2":
  56 + {
  57 + "color": [ 0.8647, 0.4569, 0.3157, 0.32 ]
  58 + },
  59 +
  60 + "BubbleColor3":
  61 + {
  62 + "color": [ 0.9804, 0.5412, 0.5510, 0.32 ]
  63 + },
  64 +
  65 + "BubbleColor4":
  66 + {
  67 + "color": [ 1, 0, 0, 0.13 ]
  68 + }
  69 +
  70 + }
  71 +}
... ...
resources/style/mobile/base-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "styles":
  20 + {
  21 + "CustomPopupStyle":{
  22 + "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/popup.9.png",
  23 + "popupBackgroundBorder":[0,4,4,0],
  24 + "tailUpImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-up.png",
  25 + "tailDownImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-down.png",
  26 + "tailLeftImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-left.png",
  27 + "tailRightImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-right.png"
  28 + },
  29 +
  30 + "DemoTileBase":
  31 + {
  32 + "states":
  33 + {
  34 + "NORMAL":
  35 + {
  36 + "color":[0.4, 0.6, 0.9, 0.6],
  37 + "visuals":
  38 + {
  39 + "image":
  40 + {
  41 + "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture.9.png",
  42 +// TILE_BACKGROUND_ALPHA
  43 +// This shader takes a texture.
  44 +// An alpha discard is performed.
  45 +// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
  46 + "shader":
  47 + {
  48 + "fragmentShader":[
  49 + " varying mediump vec2 vTexCoord;",
  50 + " uniform lowp vec4 uColor;",
  51 + " uniform sampler2D sTexture;",
  52 + " uniform mediump vec3 uCustomPosition;",
  53 + "",
  54 + " void main()",
  55 + " {",
  56 + " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
  57 + " {",
  58 + " discard;",
  59 + " }",
  60 + "",
  61 + " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
  62 + " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
  63 + " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
  64 + "",
  65 + " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
  66 + " }"
  67 + ]
  68 + }
  69 + }
  70 + }
  71 + },
  72 + "FOCUSED":
  73 + {
  74 + "color":[0.3, 0.5, 0.8, 0.5],
  75 + "visuals":
  76 + {
  77 + "image":
  78 + {
  79 + "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture-focused.9.png",
  80 +// TILE_BACKGROUND_ALPHA
  81 +// This shader takes a texture.
  82 +// An alpha discard is performed.
  83 +// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
  84 + "shader":
  85 + {
  86 + "fragmentShader":[
  87 + " varying mediump vec2 vTexCoord;",
  88 + " uniform lowp vec4 uColor;",
  89 + " uniform sampler2D sTexture;",
  90 + " uniform mediump vec3 uCustomPosition;",
  91 + "",
  92 + " void main()",
  93 + " {",
  94 + " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
  95 + " {",
  96 + " discard;",
  97 + " }",
  98 + "",
  99 + " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
  100 + " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
  101 + " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
  102 + "",
  103 + " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
  104 + " }"
  105 + ]
  106 + }
  107 + }
  108 + }
  109 + }
  110 + }
  111 + },
  112 + "FocusActor":
  113 + {
  114 + "visuals":
  115 + {
  116 + "image":
  117 + {
  118 + "url":"{APPLICATION_RESOURCE_PATH}/images/tile-focus.9.png"
  119 + }
  120 + }
  121 + },
  122 + "DemoTileBorder":
  123 + {
  124 + "visuals":
  125 + {
  126 + "image":
  127 + {
  128 + "url":"{APPLICATION_RESOURCE_PATH}/images/item-background.9.png" // TILE_BACKGROUND
  129 + }
  130 + }
  131 + },
  132 + "TextLabelRosemary":
  133 + {
  134 + "fontFamily":"Rosemary"
  135 + },
  136 + "TextLabel":
  137 + {
  138 + "fontStyle":{"weight":"normal"},
  139 + "pointSize":18
  140 + },
  141 + "TextLabelFontSize0":
  142 + {
  143 + "pointSize":8
  144 + },
  145 + "TextLabelFontSize1":
  146 + {
  147 + "pointSize":10
  148 + },
  149 + "TextLabelFontSize2":
  150 + {
  151 + "pointSize":15
  152 + },
  153 + "TextLabelFontSize3":
  154 + {
  155 + "pointSize":19
  156 + },
  157 + "TextLabelFontSize4":
  158 + {
  159 + "pointSize":25
  160 + },
  161 +
  162 + "Launcherlabel":
  163 + {
  164 + "pointSize":8
  165 + },
  166 +
  167 + "ToolbarLabel":
  168 + {
  169 + "pointSize":10
  170 + },
  171 +
  172 + "BuilderLabel":
  173 + {
  174 + "pointSize":10
  175 + },
  176 +
  177 + "ScrollView":
  178 + {
  179 + "overshootEffectColor":"B018"
  180 + },
  181 +
  182 + "GroupLabel":
  183 + {
  184 + "pointSize":6
  185 + },
  186 +
  187 + "ChangeLayoutButton":
  188 + {
  189 + "label":{
  190 + "pointSize":5
  191 + }
  192 + }
  193 + }
  194 +}
... ...
resources/style/mobile/demo-theme.json.in
  View file @2fae12d
1 1 /*
2   - * Copyright (c) 2000-2016 Samsung Electronics Co., Ltd
3   -
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  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.
6 6 * You may obtain a copy of the License at
... ... @@ -16,191 +16,49 @@
16 16 */
17 17  
18 18 {
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
19 24 "styles":
20 25 {
21   - "CustomPopupStyle":{
22   - "popupBackgroundImage":"{APPLICATION_RESOURCE_PATH}/images/popup.9.png",
23   - "popupBackgroundBorder":[0,4,4,0],
24   - "tailUpImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-up.png",
25   - "tailDownImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-down.png",
26   - "tailLeftImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-left.png",
27   - "tailRightImage":"{APPLICATION_RESOURCE_PATH}/images/popup-tail-right.png"
28   - },
29   -
30 26 "DemoTile":
31 27 {
32   - "states":
33   - {
34   - "NORMAL":
35   - {
36   - "color":[0.4, 0.6, 0.9, 0.6],
37   - "visuals":
38   - {
39   - "image":
40   - {
41   - "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture.9.png",
42   -// TILE_BACKGROUND_ALPHA
43   -// This shader takes a texture.
44   -// An alpha discard is performed.
45   -// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
46   - "shader":
47   - {
48   - "fragmentShader":[
49   - " varying mediump vec2 vTexCoord;",
50   - " uniform lowp vec4 uColor;",
51   - " uniform sampler2D sTexture;",
52   - " uniform mediump vec3 uCustomPosition;",
53   - "",
54   - " void main()",
55   - " {",
56   - " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
57   - " {",
58   - " discard;",
59   - " }",
60   - "",
61   - " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
62   - " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
63   - " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
64   - "",
65   - " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
66   - " }"
67   - ]
68   - }
69   - }
70   - }
71   - },
72   - "FOCUSED":
73   - {
74   - "color":[0.3, 0.5, 0.8, 0.5],
75   - "visuals":
76   - {
77   - "image":
78   - {
79   - "url":"{APPLICATION_RESOURCE_PATH}/images/demo-tile-texture-focused.9.png",
80   -// TILE_BACKGROUND_ALPHA
81   -// This shader takes a texture.
82   -// An alpha discard is performed.
83   -// The shader uses the tiles position within the scroll-view page and the scroll-views rotation position to create a parallax effect.
84   - "shader":
85   - {
86   - "fragmentShader":[
87   - " varying mediump vec2 vTexCoord;",
88   - " uniform lowp vec4 uColor;",
89   - " uniform sampler2D sTexture;",
90   - " uniform mediump vec3 uCustomPosition;",
91   - "",
92   - " void main()",
93   - " {",
94   - " if( texture2D( sTexture, vTexCoord ).a <= 0.0001 )",
95   - " {",
96   - " discard;",
97   - " }",
98   - "",
99   - " mediump vec2 wrapTexCoord = vec2( ( vTexCoord.x / 4.0 ) + ( uCustomPosition.x / 4.0 ) + ( uCustomPosition.z / 2.0 ), vTexCoord.y / 4.0 );",
100   - " mediump vec4 color = texture2D( sTexture, wrapTexCoord );",
101   - " mediump float positionWeight = ( uCustomPosition.y + 0.3 ) * color.r * 2.0;",
102   - "",
103   - " gl_FragColor = vec4( positionWeight, positionWeight, positionWeight, 0.9 ) * uColor + vec4( uColor.xyz, 0.0 );",
104   - " }"
105   - ]
106   - }
107   - }
108   - }
109   - }
110   - }
111   - },
112   - "FocusActor":
113   - {
114   - "visuals":
115   - {
116   - "image":
117   - {
118   - "url":"{APPLICATION_RESOURCE_PATH}/images/tile-focus.9.png"
119   - }
120   - }
  28 + "styles":[ "DemoTileBase" ]
121 29 },
122   - "DemoTileBorder":
  30 +
  31 + "LauncherBackground":
123 32 {
124   - "visuals":
  33 + "background":
125 34 {
126   - "image":
127   - {
128   - "url":"{APPLICATION_RESOURCE_PATH}/images/item-background.9.png" // TILE_BACKGROUND
129   - }
  35 + "visualType": "GRADIENT",
  36 + "center": [360, 640],
  37 + "radius": 1468,
  38 + "units": "USER_SPACE",
  39 + "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
130 40 }
131 41 },
132   - "TextLabelRosemary":
133   - {
134   - "fontFamily":"Rosemary"
135   - },
136   - "TextLabel":
137   - {
138   - "fontStyle":{"weight":"normal"},
139   - "pointSize":18
140   - },
141   - "TextLabelFontSize0":
142   - {
143   - "pointSize":8
144   - },
145   - "TextLabelFontSize1":
146   - {
147   - "pointSize":10
148   - },
149   - "TextLabelFontSize2":
150   - {
151   - "pointSize":15
152   - },
153   - "TextLabelFontSize3":
154   - {
155   - "pointSize":19
156   - },
157   - "TextLabelFontSize4":
158   - {
159   - "pointSize":25
160   - },
161   -
162   - "Launcherlabel":
163   - {
164   - "pointSize":8
165   - },
166   -
167   - "ToolbarLabel":
168   - {
169   - "pointSize":10
170   - },
171   -
172   - "BuilderLabel":
173   - {
174   - "pointSize":10
175   - },
176 42  
177   - "ScrollView":
  43 + "BubbleColor1":
178 44 {
179   - "overshootEffectColor":"B018"
  45 + "color": [ 0.3255, 0.3412, 0.6353, 0.32 ]
180 46 },
181 47  
182   - "GroupLabel":
  48 + "BubbleColor2":
183 49 {
184   - "pointSize":6
  50 + "color": [ 0.3647, 0.7569, 0.8157, 0.32 ]
185 51 },
186 52  
187   - "LauncherBackground":
  53 + "BubbleColor3":
188 54 {
189   - "background":
190   - {
191   - "visualType": "GRADIENT",
192   - "center": [360, 640],
193   - "radius": 1468,
194   - "units": "USER_SPACE",
195   - "stopColor": [[0.247,0.38,0.52,1.0],[0.055,0.18,0.286,1.0]]
196   - }
  55 + "color": [ 0.3804, 0.7412, 0.6510, 0.32 ]
197 56 },
198 57  
199   - "ChangeLayoutButton":
  58 + "BubbleColor4":
200 59 {
201   - "label":{
202   - "pointSize":5
203   - }
  60 + "color": [ 1, 1, 1, 0.13 ]
204 61 }
  62 +
205 63 }
206 64 }
... ...
resources/style/mobile/examples-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + *
  16 + */
  17 +
  18 +{
  19 + "includes":
  20 + [
  21 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  22 + ],
  23 +
  24 + "styles":
  25 + {
  26 + "DemoTile":
  27 + {
  28 + "styles": ["DemoTileBase"],
  29 + "states":
  30 + {
  31 + "NORMAL":
  32 + {
  33 + "color":[0.9, 0.4, 0.4, 0.6]
  34 + }
  35 + }
  36 + },
  37 +
  38 + "LauncherBackground":
  39 + {
  40 + "background":
  41 + {
  42 + "visualType": "GRADIENT",
  43 + "center": [360, 640],
  44 + "radius": 1468,
  45 + "units": "USER_SPACE",
  46 + "stopColor": [[0,0,0,1.0],[0.556863,0.054902,0,1.0]]
  47 + }
  48 + },
  49 +
  50 + "BubbleColor1":
  51 + {
  52 + "color": [ 0.8255, 0.2412, 0.1353, 0.32 ]
  53 + },
  54 +
  55 + "BubbleColor2":
  56 + {
  57 + "color": [ 0.8647, 0.4569, 0.3157, 0.32 ]
  58 + },
  59 +
  60 + "BubbleColor3":
  61 + {
  62 + "color": [ 0.9804, 0.5412, 0.5510, 0.32 ]
  63 + },
  64 +
  65 + "BubbleColor4":
  66 + {
  67 + "color": [ 1, 0, 0, 0.13 ]
  68 + }
  69 +
  70 + }
  71 +}
... ...
resources/style/mobile/tests-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + * Licensed under the Apache License, Version 2.0 (the "License");
  4 + * you may not use this file except in compliance with the License.
  5 + * You may obtain a copy of the License at
  6 + *
  7 + * http://www.apache.org/licenses/LICENSE-2.0
  8 + *
  9 + * Unless required by applicable law or agreed to in writing, software
  10 + * distributed under the License is distributed on an "AS IS" BASIS,
  11 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12 + * See the License for the specific language governing permissions and
  13 + * limitations under the License.
  14 + *
  15 + */
  16 +
  17 +{
  18 + "includes":
  19 + [
  20 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  21 + ],
  22 +
  23 + "styles":
  24 + {
  25 + "DemoTile":
  26 + {
  27 + "styles": ["DemoTileBase"],
  28 + "states":
  29 + {
  30 + "NORMAL":
  31 + {
  32 + "color":[0.6, 0.4, 0.9, 0.6]
  33 + }
  34 + }
  35 + },
  36 +
  37 + "LauncherBackground":
  38 + {
  39 + "background":
  40 + {
  41 + "visualType": "GRADIENT",
  42 + "center": [360, 640],
  43 + "radius": 1468,
  44 + "units": "USER_SPACE",
  45 + "stopColor": [[0.392157,0.254902,0.647059,1.0],[0.164706,0.0313725,0.270588,1.0]]
  46 + }
  47 + },
  48 +
  49 + "BubbleColor1":
  50 + {
  51 + "color": [ 0.8255, 0.2412, 0.9353, 0.32 ]
  52 + },
  53 +
  54 + "BubbleColor2":
  55 + {
  56 + "color": [ 0.8647, 0.4569, 0.8157, 0.32 ]
  57 + },
  58 +
  59 + "BubbleColor3":
  60 + {
  61 + "color": [ 0.9804, 0.5412, 0.9510, 0.32 ]
  62 + },
  63 +
  64 + "BubbleColor4":
  65 + {
  66 + "color": [ 1, 1, 1, 0.13 ]
  67 + }
  68 +
  69 + }
  70 +}
... ...
resources/style/tests-theme.json.in 0 → 100644
  View file @2fae12d
  1 +/*
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd
  3 + * Licensed under the Apache License, Version 2.0 (the "License");
  4 + * you may not use this file except in compliance with the License.
  5 + * You may obtain a copy of the License at
  6 + *
  7 + * http://www.apache.org/licenses/LICENSE-2.0
  8 + *
  9 + * Unless required by applicable law or agreed to in writing, software
  10 + * distributed under the License is distributed on an "AS IS" BASIS,
  11 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12 + * See the License for the specific language governing permissions and
  13 + * limitations under the License.
  14 + *
  15 + */
  16 +
  17 +{
  18 + "includes":
  19 + [
  20 + "{APPLICATION_RESOURCE_PATH}/style/base-theme.json"
  21 + ],
  22 +
  23 + "styles":
  24 + {
  25 + "DemoTile":
  26 + {
  27 + "styles": ["DemoTileBase"],
  28 + "states":
  29 + {
  30 + "NORMAL":
  31 + {
  32 + "color":[0.6, 0.4, 0.9, 0.6]
  33 + }
  34 + }
  35 + },
  36 +
  37 + "LauncherBackground":
  38 + {
  39 + "background":
  40 + {
  41 + "visualType": "GRADIENT",
  42 + "center": [240, 400],
  43 + "radius": 932,
  44 + "units": "USER_SPACE",
  45 + "stopColor": [[0.392157,0.254902,0.647059,1.0],[0.164706,0.0313725,0.270588,1.0]]
  46 + }
  47 + },
  48 +
  49 + "BubbleColor1":
  50 + {
  51 + "color": [ 0.8255, 0.2412, 0.9353, 0.32 ]
  52 + },
  53 +
  54 + "BubbleColor2":
  55 + {
  56 + "color": [ 0.8647, 0.4569, 0.8157, 0.32 ]
  57 + },
  58 +
  59 + "BubbleColor3":
  60 + {
  61 + "color": [ 0.9804, 0.5412, 0.9510, 0.32 ]
  62 + },
  63 +
  64 + "BubbleColor4":
  65 + {
  66 + "color": [ 1, 1, 1, 0.13 ]
  67 + }
  68 +
  69 + }
  70 +}
... ...
shared/dali-table-view.cpp
  View file @2fae12d
1 1 /*
2   - * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2019 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.
... ... @@ -69,15 +69,14 @@ const float EFFECT_SNAP_DURATION = 0.66f; ///&lt; Scroll Snap
69 69 const float EFFECT_FLICK_DURATION = 0.5f; ///< Scroll Flick Duration for Effects
70 70 const Vector3 ANGLE_CUBE_PAGE_ROTATE(Math::PI * 0.5f, Math::PI * 0.5f, 0.0f);
71 71  
72   -
73   -const Vector4 BUBBLE_COLOR[] =
  72 +const char * const BUBBLE_COLOR_STYLE_NAME[] =
74 73 {
75   - Vector4( 0.3255f, 0.3412f, 0.6353f, 0.32f ),
76   - Vector4( 0.3647f, 0.7569f, 0.8157f, 0.32f ),
77   - Vector4( 0.3804f, 0.7412f, 0.6510f, 0.32f ),
78   - Vector4( 1.f, 1.f, 1.f, 0.13f )
  74 + "BubbleColor1",
  75 + "BubbleColor2",
  76 + "BubbleColor3",
  77 + "BubbleColor4"
79 78 };
80   -const int NUMBER_OF_BUBBLE_COLOR( sizeof(BUBBLE_COLOR) / sizeof(BUBBLE_COLOR[0]) );
  79 +const int NUMBER_OF_BUBBLE_COLORS( sizeof( BUBBLE_COLOR_STYLE_NAME ) / sizeof( BUBBLE_COLOR_STYLE_NAME[ 0 ] ) );
81 80  
82 81 const char * const SHAPE_IMAGE_TABLE[] =
83 82 {
... ... @@ -87,16 +86,10 @@ const char * const SHAPE_IMAGE_TABLE[] =
87 86 const int NUMBER_OF_SHAPE_IMAGES( sizeof( SHAPE_IMAGE_TABLE ) / sizeof( SHAPE_IMAGE_TABLE[0] ) );
88 87  
89 88 const int NUM_BACKGROUND_IMAGES = 18;
90   -const float BACKGROUND_SWIPE_SCALE = 0.025f;
91 89 const float BACKGROUND_SPREAD_SCALE = 1.5f;
92   -const float SCALE_MOD = 1000.0f * Math::PI * 2.0f;
93   -const float SCALE_SPEED = 10.0f;
94   -const float SCALE_SPEED_SIN = 0.1f;
95 90  
96 91 const unsigned int BACKGROUND_ANIMATION_DURATION = 15000; // 15 secs
97 92  
98   -const Vector4 BACKGROUND_COLOR( 0.3569f, 0.5451f, 0.7294f, 1.0f );
99   -
100 93 const float BUBBLE_MIN_Z = -1.0;
101 94 const float BUBBLE_MAX_Z = 0.0f;
102 95  
... ... @@ -756,7 +749,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count )
756 749 imageMap.Add( Toolkit::Visual::Property::SHADER, effect );
757 750 dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
758 751  
759   - dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );
  752 + dfActor.SetStyleName( BUBBLE_COLOR_STYLE_NAME[ i%NUMBER_OF_BUBBLE_COLORS ] );
760 753  
761 754 layer.Add( dfActor );
762 755 }
... ... @@ -896,12 +889,14 @@ void DaliTableView::OnLogoTapped( Dali::Actor actor, const Dali::TapGesture&amp; tap
896 889  
897 890 Toolkit::TextLabel titleActor = Toolkit::TextLabel::New( "Version information" );
898 891 titleActor.SetName( "titleActor" );
899   - titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  892 + titleActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::CENTER );
  893 + titleActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
900 894  
901 895 Toolkit::TextLabel contentActor = Toolkit::TextLabel::New( stream.str() );
902 896 contentActor.SetName( "contentActor" );
903 897 contentActor.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
904   - contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
  898 + contentActor.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, HorizontalAlignment::CENTER );
  899 + contentActor.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE );
905 900 contentActor.SetPadding( Padding( 0.0f, 0.0f, 20.0f, 0.0f ) );
906 901  
907 902 mVersionPopup.SetTitle( titleActor );
... ...
tests-reel/dali-tests-reel.cpp
  View file @2fae12d
... ... @@ -31,7 +31,7 @@ int DALI_EXPORT_API main(int argc, char **argv)
31 31 textdomain(DALI_DEMO_DOMAIN_LOCAL);
32 32 setlocale(LC_ALL, DEMO_LANG);
33 33  
34   - Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
  34 + Application app = Application::New( &argc, &argv, DEMO_STYLE_DIR "/tests-theme.json" );
35 35  
36 36 // Create the demo launcher
37 37 DaliTableView demo(app);
... ...