summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-11-08 19:21:04 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-11-08 19:21:04 +0000
commit02f69bb7cbb33f7b360567d20ba2df2a8eac69d0 (patch)
treef3465b4ec9eeac99093551512e648378f6ce9ad9 /data/elementary/themes
parent5495ab875344cc04b9c01efb3542f8b5ac0bc9d0 (diff)
TH - notify + popup
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/edc/elm/notify.edc79
-rw-r--r--data/elementary/themes/edc/elm/popup.edc121
2 files changed, 97 insertions, 103 deletions
diff --git a/data/elementary/themes/edc/elm/notify.edc b/data/elementary/themes/edc/elm/notify.edc
index b6e8b99704..f922dd11cf 100644
--- a/data/elementary/themes/edc/elm/notify.edc
+++ b/data/elementary/themes/edc/elm/notify.edc
@@ -6,29 +6,25 @@ group { name: "elm/notify/block_events/default";
6 color: 0 0 0 0; 6 color: 0 0 0 0;
7 } 7 }
8 desc { "visible"; 8 desc { "visible";
9 color: 0 0 0 64; /* FIXME: color_class */ 9 color: 0 0 0 128; /* FIXME: color_class */
10 } 10 }
11 } 11 }
12 program { 12 program { signal: "mouse,clicked,1"; source: "block_events";
13 signal: "mouse,clicked,1"; source: "block_events";
14 action: SIGNAL_EMIT "elm,action,click" "elm"; 13 action: SIGNAL_EMIT "elm,action,click" "elm";
15 } 14 }
16 program { 15 program { signal: "show"; source: "*";
17 signal: "show"; source: "*";
18 action: STATE_SET "visible"; 16 action: STATE_SET "visible";
19 targets: "block_events"; 17 targets: "block_events";
20 transition: DECELERATE 0.3; 18 transition: DECELERATE 0.2;
21 } 19 }
22 program { 20 program { signal: "hide"; source: "";
23 signal: "hide"; source: "";
24 action: STATE_SET "default" 0.0; 21 action: STATE_SET "default" 0.0;
25 target: "block_events"; 22 target: "block_events";
26 } 23 }
27 program { 24 program { signal: "elm,state,hide"; source: "elm";
28 signal: "elm,state,hide"; source: "elm";
29 action: STATE_SET "default" 0.0; 25 action: STATE_SET "default" 0.0;
30 target: "block_events"; 26 target: "block_events";
31 transition: DECELERATE 0.3; 27 transition: DECELERATE 0.5;
32 after: "hide_finish"; 28 after: "hide_finish";
33 } 29 }
34 program { name: "hide_finish"; 30 program { name: "hide_finish";
@@ -38,11 +34,12 @@ group { name: "elm/notify/block_events/default";
38} 34}
39 35
40group { name: "elm/notify/top/default"; 36group { name: "elm/notify/top/default";
41 images.image: "darken_rounded_square.png" COMP;
42 data.item: "hide_finished_signal" "on"; 37 data.item: "hide_finished_signal" "on";
43 parts { 38 parts {
44 part { name: "clip"; type: RECT; 39 part { name: "clip"; type: RECT;
45 description { state: "default" 0.0; 40 description { state: "default" 0.0;
41 rel1.offset: -500 -500;
42 rel2.offset: 499 499;
46 color: 255 255 255 0; 43 color: 255 255 255 0;
47 } 44 }
48 description { state: "visible" 0.0; 45 description { state: "visible" 0.0;
@@ -50,15 +47,26 @@ group { name: "elm/notify/top/default";
50 color: 255 255 255 255; 47 color: 255 255 255 255;
51 } 48 }
52 } 49 }
53 part { name: "base"; 50 part { name: "shadow"; mouse_events: 0;
54 clip_to: "clip"; 51 clip_to: "clip";
55 description { state: "default" 0.0; 52 description { state: "default" 0.0;
56 image.normal: "darken_rounded_square.png"; 53 rel.to: "base";
57 image.border: 15 15 15 15; 54 WIN_SHADOW;
55 }
56 description { state: "visible" 0.0;
57 inherit: "default" 0.0;
58 }
59 }
60 part { name: "base"; type: RECT;
61 clip_to: "clip";
62 scale: 1;
63 description { state: "default" 0.0;
64 color: 48 48 48 255;
58 rel1.offset: 10 10; 65 rel1.offset: 10 10;
59 rel2.offset: -10 -10; 66 rel2.offset: -11 -11;
60 rel1.relative: 0.0 -1.0; 67 rel1.relative: 0.0 -1.0;
61 rel2.relative: 1.0 0.0; 68 rel2.relative: 1.0 0.0;
69 offscale;
62 } 70 }
63 description { state: "visible" 0.0; 71 description { state: "visible" 0.0;
64 inherit: "default" 0.0; 72 inherit: "default" 0.0;
@@ -68,33 +76,34 @@ group { name: "elm/notify/top/default";
68 } 76 }
69 part { name: "elm.swallow.content"; type: SWALLOW; 77 part { name: "elm.swallow.content"; type: SWALLOW;
70 clip_to: "clip"; 78 clip_to: "clip";
79 scale: 1;
71 description { state: "default" 0.0; 80 description { state: "default" 0.0;
72 rel1.to: "base"; 81 rel.to: "base";
73 rel1.offset: 12 12; 82 rel1.offset: 10 10;
74 rel2.to: "base"; 83 rel2.offset: -11 -11;
75 rel2.offset: -13 -13; 84 offscale;
76 } 85 }
77 } 86 }
78 } 87 }
79 programs { 88 programs {
80 program { 89 program { signal: "show"; source: "";
81 signal: "show"; source: "";
82 action: STATE_SET "visible" 0.0; 90 action: STATE_SET "visible" 0.0;
83 target: "clip"; 91 target: "clip";
84 target: "base"; 92 target: "base";
85 transition: DECELERATE 0.5; 93 target: "shadow";
94 transition: DECELERATE 0.2;
86 } 95 }
87 program { 96 program { signal: "hide"; source: "";
88 signal: "hide"; source: "";
89 action: STATE_SET "default" 0.0; 97 action: STATE_SET "default" 0.0;
90 target: "clip"; 98 target: "clip";
91 target: "base"; 99 target: "base";
100 target: "shadow";
92 } 101 }
93 program { 102 program { signal: "elm,state,hide"; source: "elm";
94 signal: "elm,state,hide"; source: "elm";
95 action: STATE_SET "default" 0.0; 103 action: STATE_SET "default" 0.0;
96 target: "clip"; 104 target: "clip";
97 target: "base"; 105 target: "base";
106 target: "shadow";
98 transition: DECELERATE 0.5; 107 transition: DECELERATE 0.5;
99 after: "hide_finish"; 108 after: "hide_finish";
100 } 109 }
@@ -110,7 +119,7 @@ group { name: "elm/notify/bottom/default";
110 part { name: "base"; 119 part { name: "base";
111 description { state: "default" 0.0; 120 description { state: "default" 0.0;
112 rel1.offset: 10 10; 121 rel1.offset: 10 10;
113 rel2.offset: -10 -10; 122 rel2.offset: -11 -11;
114 rel1.relative: 0.0 1.0; 123 rel1.relative: 0.0 1.0;
115 rel2.relative: 1.0 2.0; 124 rel2.relative: 1.0 2.0;
116 } 125 }
@@ -124,7 +133,7 @@ group { name: "elm/notify/left/default";
124 part { name: "base"; 133 part { name: "base";
125 description { state: "default" 0.0; 134 description { state: "default" 0.0;
126 rel1.offset: 10 10; 135 rel1.offset: 10 10;
127 rel2.offset: -10 -10; 136 rel2.offset: -11 -11;
128 rel1.relative: -1.0 0.0; 137 rel1.relative: -1.0 0.0;
129 rel2.relative: 0.0 1.0; 138 rel2.relative: 0.0 1.0;
130 } 139 }
@@ -138,7 +147,7 @@ group { name: "elm/notify/right/default";
138 part { name: "base"; 147 part { name: "base";
139 description { state: "default" 0.0; 148 description { state: "default" 0.0;
140 rel1.offset: 10 10; 149 rel1.offset: 10 10;
141 rel2.offset: -10 -10; 150 rel2.offset: -11 -11;
142 rel1.relative: 1.0 0.0; 151 rel1.relative: 1.0 0.0;
143 rel2.relative: 2.0 1.0; 152 rel2.relative: 2.0 1.0;
144 } 153 }
@@ -152,7 +161,7 @@ group { name: "elm/notify/top_left/default";
152 part { name: "base"; 161 part { name: "base";
153 description { state: "default" 0.0; 162 description { state: "default" 0.0;
154 rel1.offset: 10 10; 163 rel1.offset: 10 10;
155 rel2.offset: -10 -10; 164 rel2.offset: -11 -11;
156 rel1.relative: 0.0 -1.0; 165 rel1.relative: 0.0 -1.0;
157 rel2.relative: 1.0 0.0; 166 rel2.relative: 1.0 0.0;
158 } 167 }
@@ -166,7 +175,7 @@ group { name: "elm/notify/top_right/default";
166 part { name: "base"; 175 part { name: "base";
167 description { state: "default" 0.0; 176 description { state: "default" 0.0;
168 rel1.offset: 10 10; 177 rel1.offset: 10 10;
169 rel2.offset: -10 -10; 178 rel2.offset: -11 -11;
170 rel1.relative: 0.0 -1.0; 179 rel1.relative: 0.0 -1.0;
171 rel2.relative: 1.0 0.0; 180 rel2.relative: 1.0 0.0;
172 } 181 }
@@ -180,7 +189,7 @@ group { name: "elm/notify/bottom_left/default";
180 part { name: "base"; 189 part { name: "base";
181 description { state: "default" 0.0; 190 description { state: "default" 0.0;
182 rel1.offset: 10 10; 191 rel1.offset: 10 10;
183 rel2.offset: -10 -10; 192 rel2.offset: -11 -11;
184 rel1.relative: 0.0 1.0; 193 rel1.relative: 0.0 1.0;
185 rel2.relative: 1.0 2.0; 194 rel2.relative: 1.0 2.0;
186 } 195 }
@@ -194,7 +203,7 @@ group { name: "elm/notify/bottom_right/default";
194 part { name: "base"; 203 part { name: "base";
195 description { state: "default" 0.0; 204 description { state: "default" 0.0;
196 rel1.offset: 10 10; 205 rel1.offset: 10 10;
197 rel2.offset: -10 -10; 206 rel2.offset: -11 -11;
198 rel1.relative: 0.0 1.0; 207 rel1.relative: 0.0 1.0;
199 rel2.relative: 1.0 2.0; 208 rel2.relative: 1.0 2.0;
200 } 209 }
@@ -208,7 +217,7 @@ group { name: "elm/notify/center/default";
208 part { name: "base"; 217 part { name: "base";
209 description { state: "default" 0.0; 218 description { state: "default" 0.0;
210 rel1.offset: 10 10; 219 rel1.offset: 10 10;
211 rel2.offset: -10 -10; 220 rel2.offset: -11 -11;
212 rel1.relative: 0.0 0.0; 221 rel1.relative: 0.0 0.0;
213 rel2.relative: 1.0 1.0; 222 rel2.relative: 1.0 1.0;
214 } 223 }
diff --git a/data/elementary/themes/edc/elm/popup.edc b/data/elementary/themes/edc/elm/popup.edc
index 0636602fda..7270934f3d 100644
--- a/data/elementary/themes/edc/elm/popup.edc
+++ b/data/elementary/themes/edc/elm/popup.edc
@@ -17,8 +17,7 @@ group { name: "elm/notify/block_events/popup/transparent";
17 color: 0 0 0 192; 17 color: 0 0 0 192;
18 } 18 }
19 } 19 }
20 program { 20 program { signal: "mouse,down,1"; source: "base";
21 signal: "mouse,down,1"; source: "base";
22 action: SIGNAL_EMIT "elm,action,click" "elm"; 21 action: SIGNAL_EMIT "elm,action,click" "elm";
23 after: "click1"; 22 after: "click1";
24 } 23 }
@@ -27,8 +26,7 @@ group { name: "elm/notify/block_events/popup/transparent";
27 target: "base"; 26 target: "base";
28 transition: SINUSOIDAL 0.2; 27 transition: SINUSOIDAL 0.2;
29 } 28 }
30 program { 29 program { signal: "mouse,up,1"; source: "base";
31 signal: "mouse,up,1"; source: "base";
32 action: STATE_SET "default" 0.0; 30 action: STATE_SET "default" 0.0;
33 target: "base"; 31 target: "base";
34 transition: DECELERATE 0.5; 32 transition: DECELERATE 0.5;
@@ -39,14 +37,19 @@ group { name: "elm/notify/block_events/popup/transparent";
39group { name: "elm/notify/top/popup/default"; 37group { name: "elm/notify/top/popup/default";
40 inherit: "elm/notify/top/default"; 38 inherit: "elm/notify/top/default";
41#define OVERRIDE_BASE() \ 39#define OVERRIDE_BASE() \
42 images.image: "rounded_square.png" COMP; \
43 parts { \ 40 parts { \
44 part { name: "base"; \ 41 part { name: "shadow"; mouse_events: 0; \
45 description { state: "default" 0.0; \ 42 description { state: "default" 0.0; \
46 image.normal: "rounded_square.png"; \ 43 rel.to: "base"; \
44 WIN_SHADOW; \
45 } \
46 } \
47 part { name: "base"; type: RECT; \
48 description { state: "default" 0.0; \
49 color: 48 48 48 255; \
47 } \ 50 } \
48 description { state: "visible" 0.0; \ 51 description { state: "visible" 0.0; \
49 image.normal: "rounded_square.png"; \ 52 color: 48 48 48 255; \
50 } \ 53 } \
51 } \ 54 } \
52 } 55 }
@@ -134,7 +137,7 @@ group { name: "elm/label/base/popup/default";
134 alias: "elm/label/base/popup/transparent"; 137 alias: "elm/label/base/popup/transparent";
135 styles { 138 styles {
136 style { name: "popup_desc_style"; 139 style { name: "popup_desc_style";
137 base: "font="FN" font_size=10 text_class=label align=center color=#fff color_class=popup_text style=shadow,bottom shadow_color=#00000080 wrap=mixed"; 140 base: "font="FN" font_size=10 text_class=label align=center color=#a0a0a0 wrap=mixed";
138 tag: "br" "\n"; 141 tag: "br" "\n";
139 tag: "hilight" "+ font="FNBD" text_class=label_light"; 142 tag: "hilight" "+ font="FNBD" text_class=label_light";
140 tag: "b" "+ font="FNBD" text_class=label_light"; 143 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -142,7 +145,7 @@ group { name: "elm/label/base/popup/default";
142 tag: "tab" "\t"; 145 tag: "tab" "\t";
143 } 146 }
144 style { name: "popup_title_style_ellipsis"; 147 style { name: "popup_title_style_ellipsis";
145 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed"; 148 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed";
146 tag: "br" "\n"; 149 tag: "br" "\n";
147 tag: "hilight" "+ font="FNBD" text_class=label_light"; 150 tag: "hilight" "+ font="FNBD" text_class=label_light";
148 tag: "b" "+ font="FNBD" text_class=label_light"; 151 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -154,13 +157,13 @@ group { name: "elm/label/base/popup/default";
154 part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0; 157 part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
155 scale: 1; 158 scale: 1;
156 description { state: "default" 0.0; 159 description { state: "default" 0.0;
157 text { 160 text { style: "popup_desc_style";
158 style: "popup_desc_style";
159 min: 0 1; 161 min: 0 1;
160 max: 0 1; 162 max: 0 1;
161 } 163 }
162 rel1.offset: 2 2; 164 rel1.offset: 5 5;
163 rel2.offset: -3 -3; 165 rel2.offset: -6 -6;
166 offscale;
164 } 167 }
165 } 168 }
166 } 169 }
@@ -178,7 +181,7 @@ group { name: "elm/popup/base/default";
178 alias: "elm/popup/base/transparent"; 181 alias: "elm/popup/base/transparent";
179 styles { 182 styles {
180 style { name: "popup_title_style"; 183 style { name: "popup_title_style";
181 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 wrap=mixed"; 184 base: "font="FNBD" font_size=10 text_class=label align=center color=#fff wrap=mixed";
182 tag: "br" "\n"; 185 tag: "br" "\n";
183 tag: "hilight" "+ font="FNBD" text_class=label_light"; 186 tag: "hilight" "+ font="FNBD" text_class=label_light";
184 tag: "b" "+ font="FNBD" text_class=label_light"; 187 tag: "b" "+ font="FNBD" text_class=label_light";
@@ -191,39 +194,37 @@ group { name: "elm/popup/base/default";
191 scale: 1; 194 scale: 1;
192 description { state: "default" 0.0; 195 description { state: "default" 0.0;
193 min: 240 0; 196 min: 240 0;
194 color_class: "popup_bg"; 197 color: 0 0 0 0;
195 } 198 }
196 } 199 }
197 part { name: "elm.swallow.background"; type: SWALLOW; 200 part { name: "elm.swallow.background"; type: SWALLOW;
198 scale: 1; 201 scale: 1;
199 description { state: "default" 0.0; 202 description { state: "default" 0.0;
200 fixed: 1 1; 203 fixed: 1 1;
201 rel1.to: "base"; 204 rel.to: "base";
202 rel2.to: "base";
203 } 205 }
204 } 206 }
205 part { name: "elm.bg.title"; type: RECT; 207 part { name: "elm.bg.title"; type: RECT;
206 description { state: "default" 0.0; 208 description { state: "default" 0.0;
207 fixed: 1 1; 209 fixed: 1 1;
208 rel1.to: "elm.text.title"; 210 rel.to: "elm.text.title";
209 rel2.to: "elm.text.title"; 211 color: 0 0 0 0;
210 color_class: "popup_title_bg";
211 } 212 }
212 } 213 }
213 part { name: "elm.text.title"; type: TEXTBLOCK; 214 part { name: "elm.text.title"; type: TEXTBLOCK;
214 scale: 1; 215 scale: 1;
215 description { state: "default" 0.0; 216 description { state: "default" 0.0;
216 fixed: 0 1; 217 fixed: 0 1;
217 text { 218 text { style: "popup_title_style";
218 style: "popup_title_style";
219 min: 1 1; 219 min: 1 1;
220 ellipsis: -1; 220 ellipsis: -1;
221 } 221 }
222 visible: 0; 222 visible: 0;
223 rel1.offset: 2 2; 223 rel1.offset: 5 5;
224 rel2.offset: -3 2; 224 rel2.offset: -6 5;
225 rel2.relative: 1.0 0.0; 225 rel2.relative: 1.0 0.0;
226 align: 0.5 0.0; 226 align: 0.5 0.0;
227 offscale;
227 } 228 }
228 description { state: "visible" 0.0; 229 description { state: "visible" 0.0;
229 inherit: "default" 0.0; 230 inherit: "default" 0.0;
@@ -247,9 +248,11 @@ group { name: "elm/popup/base/default";
247 } 248 }
248 } 249 }
249 part { name: "elm.swallow.content"; type: SWALLOW; 250 part { name: "elm.swallow.content"; type: SWALLOW;
251 scale: 1;
250 description { state: "default" 0.0; 252 description { state: "default" 0.0;
251 rel1.offset: 2 2; 253 rel1.offset: 5 5;
252 rel2.offset: -3 -3; 254 rel2.offset: -6 -6;
255 offscale;
253 } 256 }
254 description { state: "show_title_area" 0.0; 257 description { state: "show_title_area" 0.0;
255 inherit: "default" 0.0; 258 inherit: "default" 0.0;
@@ -275,58 +278,51 @@ group { name: "elm/popup/base/default";
275 fixed: 0 1; 278 fixed: 0 1;
276 align: 0.5 1.0; 279 align: 0.5 1.0;
277 visible: 0; 280 visible: 0;
281 rel.to: "base";
278 rel1.relative: 0.0 1.0; 282 rel1.relative: 0.0 1.0;
279 rel1.offset: 2 -3; 283 rel1.offset: 5 -6;
280 rel1.to: "base"; 284 rel2.offset: -6 -6;
281 rel2.offset: -3 -3; 285 offscale;
282 rel2.to: "base";
283 } 286 }
284 description { state: "visible" 0.0; 287 description { state: "visible" 0.0;
285 inherit: "default" 0.0; 288 inherit: "default" 0.0;
286 visible: 1; 289 visible: 1;
287 } 290 }
288 } 291 }
289 292
290 part { name: "access.title"; type: RECT; repeat_events: 1; 293 part { name: "access.title"; type: RECT; repeat_events: 1;
291 description { state: "default" 0.0; 294 description { state: "default" 0.0;
292 fixed: 1 1; 295 fixed: 1 1;
293 rel1.to: "elm.bg.title"; 296 rel.to: "elm.bg.title";
294 rel2.to: "elm.bg.title";
295 color: 0 0 0 0; 297 color: 0 0 0 0;
296 } 298 }
297 } 299 }
298 part { name: "access.body"; type: RECT; repeat_events: 1; 300 part { name: "access.body"; type: RECT; repeat_events: 1;
299 description { state: "default" 0.0; 301 description { state: "default" 0.0;
300 fixed: 1 1; 302 fixed: 1 1;
301 rel1.to: "elm.swallow.content"; 303 rel.to: "elm.swallow.content";
302 rel2.to: "elm.swallow.content";
303 color: 0 0 0 0; 304 color: 0 0 0 0;
304 } 305 }
305 } 306 }
306 } 307 }
307 programs { 308 programs {
308 program { 309 program { signal: "elm,state,title,icon,visible"; source: "elm";
309 signal: "elm,state,title,icon,visible"; source: "elm";
310 action: STATE_SET "visible" 0.0; 310 action: STATE_SET "visible" 0.0;
311 target: "elm.swallow.title.icon"; 311 target: "elm.swallow.title.icon";
312 } 312 }
313 program { 313 program { signal: "elm,state,title,icon,hidden"; source: "elm";
314 signal: "elm,state,title,icon,hidden"; source: "elm";
315 action: STATE_SET "default" 0.0; 314 action: STATE_SET "default" 0.0;
316 target: "elm.swallow.title.icon"; 315 target: "elm.swallow.title.icon";
317 } 316 }
318 program { 317 program { signal: "elm,state,title,text,visible"; source: "elm";
319 signal: "elm,state,title,text,visible"; source: "elm";
320 action: STATE_SET "visible" 0.0; 318 action: STATE_SET "visible" 0.0;
321 target: "elm.text.title"; 319 target: "elm.text.title";
322 } 320 }
323 program { 321 program { signal: "elm,state,title,text,hidden"; source: "elm";
324 signal: "elm,state,title,text,hidden"; source: "elm";
325 action: STATE_SET "default" 0.0; 322 action: STATE_SET "default" 0.0;
326 target: "elm.text.title"; 323 target: "elm.text.title";
327 } 324 }
328 program { 325 program { signal: "elm,state,title_area,visible"; source: "elm";
329 signal: "elm,state,title_area,visible"; source: "elm";
330 script { 326 script {
331 new st[31], Float:vl; 327 new st[31], Float:vl;
332 get_state(PART:"elm.swallow.action_area", st, 30, vl); 328 get_state(PART:"elm.swallow.action_area", st, 30, vl);
@@ -337,8 +333,7 @@ group { name: "elm/popup/base/default";
337 set_state(PART:"elm.text.title", "visible", 0.0); 333 set_state(PART:"elm.text.title", "visible", 0.0);
338 } 334 }
339 } 335 }
340 program { 336 program { signal: "elm,state,title_area,hidden"; source: "elm";
341 signal: "elm,state,title_area,hidden"; source: "elm";
342 script { 337 script {
343 new st[31], Float:vl; 338 new st[31], Float:vl;
344 get_state(PART:"elm.swallow.action_area", st, 30, vl); 339 get_state(PART:"elm.swallow.action_area", st, 30, vl);
@@ -349,8 +344,7 @@ group { name: "elm/popup/base/default";
349 set_state(PART:"elm.text.title", "default", 0.0); 344 set_state(PART:"elm.text.title", "default", 0.0);
350 } 345 }
351 } 346 }
352 program { 347 program { signal: "elm,state,action_area,visible"; source: "elm";
353 signal: "elm,state,action_area,visible"; source: "elm";
354 script { 348 script {
355 new st[31], Float:vl; 349 new st[31], Float:vl;
356 get_state(PART:"elm.text.title", st, 30, vl); 350 get_state(PART:"elm.text.title", st, 30, vl);
@@ -361,8 +355,7 @@ group { name: "elm/popup/base/default";
361 set_state(PART:"elm.swallow.action_area", "visible", 0.0); 355 set_state(PART:"elm.swallow.action_area", "visible", 0.0);
362 } 356 }
363 } 357 }
364 program { 358 program { signal: "elm,state,action_area,hidden"; source: "elm";
365 signal: "elm,state,action_area,hidden"; source: "elm";
366 script { 359 script {
367 new st[31], Float:vl; 360 new st[31], Float:vl;
368 get_state(PART:"elm.text.title", st, 30, vl); 361 get_state(PART:"elm.text.title", st, 30, vl);
@@ -390,13 +383,11 @@ group { name: "elm/popup/content/popup/default";
390 } 383 }
391 } 384 }
392 programs { 385 programs {
393 program { 386 program { signal: "elm,scroll,enable"; source: "elm";
394 signal: "elm,scroll,enable"; source: "elm";
395 action: STATE_SET "scroll" 0.0; 387 action: STATE_SET "scroll" 0.0;
396 target: "elm.swallow.content"; 388 target: "elm.swallow.content";
397 } 389 }
398 program { 390 program { signal: "elm,scroll,disable"; source: "elm";
399 signal: "elm,scroll,disable"; source: "elm";
400 action: STATE_SET "default" 0.0; 391 action: STATE_SET "default" 0.0;
401 target: "elm.swallow.content"; 392 target: "elm.swallow.content";
402 } 393 }
@@ -466,22 +457,18 @@ group { name: "elm/popup/item/popup/default";
466 insert_after: "elm.swallow.icon"; 457 insert_after: "elm.swallow.icon";
467 description { state: "default" 0.0; 458 description { state: "default" 0.0;
468 fixed: 0 1; 459 fixed: 0 1;
469 rel1.to: "elm.swallow.icon"; 460 rel.to: "elm.swallow.icon";
470 rel2.to: "elm.swallow.icon";
471 } 461 }
472 } 462 }
473 } 463 }
474 programs { 464 programs {
475 program { 465 program { signal: "mouse,down,1"; source: "event";
476 signal: "mouse,down,1"; source: "event";
477 action: SIGNAL_EMIT "elm,state,selected" "elm"; 466 action: SIGNAL_EMIT "elm,state,selected" "elm";
478 } 467 }
479 program { 468 program { signal: "mouse,up,1"; source: "event";
480 signal: "mouse,up,1"; source: "event";
481 action: SIGNAL_EMIT "elm,state,unselected" "elm"; 469 action: SIGNAL_EMIT "elm,state,unselected" "elm";
482 } 470 }
483 program { 471 program { signal: "mouse,clicked,1"; source: "event";
484 signal: "mouse,clicked,1"; source: "event";
485 action: SIGNAL_EMIT "elm,action,click" "elm"; 472 action: SIGNAL_EMIT "elm,action,click" "elm";
486 } 473 }
487 } 474 }
@@ -492,9 +479,8 @@ group { name: "elm/popup/base/subpopup";
492 parts { 479 parts {
493 part { name: "pad_closebtn"; type: SPACER; 480 part { name: "pad_closebtn"; type: SPACER;
494 description { state: "default" 0.0; 481 description { state: "default" 0.0;
495 rel1.to: "base"; 482 rel.to: "base";
496 rel1.relative: 1 0; 483 rel1.relative: 1 0;
497 rel2.to: "base";
498 rel2.relative: 1 0; 484 rel2.relative: 1 0;
499 min: 2 2; 485 min: 2 2;
500 max: 2 2; 486 max: 2 2;
@@ -505,9 +491,8 @@ group { name: "elm/popup/base/subpopup";
505 part { name: "elm.swallow.closebtn"; type: SWALLOW; 491 part { name: "elm.swallow.closebtn"; type: SWALLOW;
506 scale: 1; 492 scale: 1;
507 description { state: "default" 0.0; 493 description { state: "default" 0.0;
508 rel1.to: "pad_closebtn"; 494 rel.to: "pad_closebtn";
509 rel1.relative: 1 0; 495 rel1.relative: 1 0;
510 rel2.to: "pad_closebtn";
511 rel2.relative: 1 0; 496 rel2.relative: 1 0;
512 align: 0 1; 497 align: 0 1;
513 fixed: 1 1; 498 fixed: 1 1;