summaryrefslogtreecommitdiff
path: root/data/elementary/themes
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-17 10:07:14 +0100
committerCedric BAIL <cedric.bail@free.fr>2019-12-20 10:33:38 -0800
commitc49880076c353202e1d7a19ac2841a01f5756d41 (patch)
treebcd5c5a6d4611828da2ae714db895f2d09ba89eb /data/elementary/themes
parent193ae1c14ceb0b61d172a89d2dec8fe3d28d7733 (diff)
efl_ui_item: use signals from the theme and not object
the problem here is that when we are using the signals from the object, then the edje object itself will receive press/unpress events before any content that is swallowed into the edje object. This means, that no clickable content, added to a item could be clicked without selecting / unselecting the item. Which was a problem. With this commit the theme is sending signals which are then passed to the efl.input.clickable mixin, this way, the part is stacked below the added content, which means, clickable content will not select / unselect the item anymore. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10892
Diffstat (limited to 'data/elementary/themes')
-rw-r--r--data/elementary/themes/edc/efl/grid.edc21
-rw-r--r--data/elementary/themes/edc/efl/group_item.edc2
-rw-r--r--data/elementary/themes/edc/efl/list.edc42
3 files changed, 34 insertions, 31 deletions
diff --git a/data/elementary/themes/edc/efl/grid.edc b/data/elementary/themes/edc/efl/grid.edc
index 51c1bd941d..d312ee71db 100644
--- a/data/elementary/themes/edc/efl/grid.edc
+++ b/data/elementary/themes/edc/efl/grid.edc
@@ -41,7 +41,7 @@ group { "efl/view_grid";
41 data.item: "version" "123"; 41 data.item: "version" "123";
42} 42}
43 43
44group { "efl/grid_item"; data.item: "version" "123"; 44group { "efl/grid_item"; data.item: "version" "124";
45 data.item: "selectraise" "on"; 45 data.item: "selectraise" "on";
46 data.item: "focusraise" "on"; 46 data.item: "focusraise" "on";
47 images.image: "bevel_dark_out.png" COMP; 47 images.image: "bevel_dark_out.png" COMP;
@@ -52,15 +52,6 @@ group { "efl/grid_item"; data.item: "version" "123";
52 parts { 52 parts {
53 53
54 // BASE PARTS // 54 // BASE PARTS //
55 rect { "event";
56 desc { "default";
57 color: 0 0 0 0;
58 }
59 desc { "disabled";
60 inherit: "default";
61 hid;
62 }
63 }
64 rect { "base"; mouse; 55 rect { "base"; mouse;
65 desc { "default"; 56 desc { "default";
66 } 57 }
@@ -208,6 +199,15 @@ group { "efl/grid_item"; data.item: "version" "123";
208 color: 255 255 255 64; 199 color: 255 255 255 64;
209 } 200 }
210 } 201 }
202 rect { "event";
203 desc { "default";
204 color: 0 0 0 0;
205 }
206 desc { "disabled";
207 inherit: "default";
208 hid;
209 }
210 }
211 swallow { "efl.icon"; 211 swallow { "efl.icon";
212 clip_to: "icon_area"; 212 clip_to: "icon_area";
213 desc { "default"; 213 desc { "default";
@@ -258,6 +258,7 @@ group { "efl/grid_item"; data.item: "version" "123";
258 // TOP PARTS // 258 // TOP PARTS //
259 } 259 }
260 programs { 260 programs {
261 EFL_UI_CLICKABLE_PART_BIND("event")
261 program { 262 program {
262 signal: "efl,state,selected"; source: "efl"; 263 signal: "efl,state,selected"; source: "efl";
263 action: STATE_SET "selected"; 264 action: STATE_SET "selected";
diff --git a/data/elementary/themes/edc/efl/group_item.edc b/data/elementary/themes/edc/efl/group_item.edc
index a76ae36c8c..16d4c78b94 100644
--- a/data/elementary/themes/edc/efl/group_item.edc
+++ b/data/elementary/themes/edc/efl/group_item.edc
@@ -8,7 +8,7 @@ Group: efl/group_item (@since 1.23)
8 8
9*/ 9*/
10 10
11group { "efl/group_item"; data.item: "version" "123"; nomouse; program_source: "efl"; 11group { "efl/group_item"; data.item: "version" "124"; nomouse; program_source: "efl";
12 images.image: "shadow_square_tiny.png" COMP; 12 images.image: "shadow_square_tiny.png" COMP;
13 images.image: "bevel_out.png" COMP; 13 images.image: "bevel_out.png" COMP;
14 images.image: "horizontal_separated_bar_small_glow.png" COMP; 14 images.image: "horizontal_separated_bar_small_glow.png" COMP;
diff --git a/data/elementary/themes/edc/efl/list.edc b/data/elementary/themes/edc/efl/list.edc
index 71da7877f2..debbd77944 100644
--- a/data/elementary/themes/edc/efl/list.edc
+++ b/data/elementary/themes/edc/efl/list.edc
@@ -56,7 +56,7 @@ group { "efl/list_view";
56 data.item: "version" "123"; 56 data.item: "version" "123";
57} 57}
58 58
59group { "efl/list_item"; data.item: "version" "123"; 59group { "efl/list_item"; data.item: "version" "124";
60 data.item: "selectraise" "on"; 60 data.item: "selectraise" "on";
61 data.item: "focusraise" "on"; 61 data.item: "focusraise" "on";
62 images.image: "bevel_curved_horiz_out.png" COMP; 62 images.image: "bevel_curved_horiz_out.png" COMP;
@@ -65,15 +65,6 @@ group { "efl/list_item"; data.item: "version" "123";
65 images.image: "bevel_horiz_out.png" COMP; 65 images.image: "bevel_horiz_out.png" COMP;
66 images.image: "shine.png" COMP; 66 images.image: "shine.png" COMP;
67 parts { 67 parts {
68 rect { "event";
69 desc { "default";
70 color: 0 0 0 0;
71 }
72 desc { "disabled";
73 inherit: "default";
74 hid;
75 }
76 }
77 rect { "base"; nomouse; 68 rect { "base"; nomouse;
78 desc { "default"; 69 desc { "default";
79 color: 64 64 64 255; 70 color: 64 64 64 255;
@@ -218,6 +209,15 @@ group { "efl/list_item"; data.item: "version" "123";
218 hid; 209 hid;
219 } 210 }
220 } 211 }
212 rect { "event";
213 desc { "default";
214 color: 0 0 0 0;
215 }
216 desc { "disabled";
217 inherit: "default";
218 hid;
219 }
220 }
221 //##// 221 //##//
222 swallow { "efl.icon"; 222 swallow { "efl.icon";
223 desc { "default"; 223 desc { "default";
@@ -268,6 +268,7 @@ group { "efl/list_item"; data.item: "version" "123";
268 } 268 }
269 } 269 }
270 programs { 270 programs {
271 EFL_UI_CLICKABLE_PART_BIND("event")
271 program { 272 program {
272 signal: "efl,state,odd"; source: "efl"; 273 signal: "efl,state,odd"; source: "efl";
273 action: STATE_SET "odd"; 274 action: STATE_SET "odd";
@@ -343,7 +344,7 @@ group { "efl/list_item"; data.item: "version" "123";
343 } 344 }
344} 345}
345 346
346group { "efl/list_item:placeholder"; data.item: "version" "123"; 347group { "efl/list_item:placeholder"; data.item: "version" "124";
347 data.item: "selectraise" "on"; 348 data.item: "selectraise" "on";
348 data.item: "focusraise" "on"; 349 data.item: "focusraise" "on";
349 images.image: "bevel_curved_horiz_out.png" COMP; 350 images.image: "bevel_curved_horiz_out.png" COMP;
@@ -352,15 +353,6 @@ group { "efl/list_item:placeholder"; data.item: "version" "123";
352 images.image: "bevel_horiz_out.png" COMP; 353 images.image: "bevel_horiz_out.png" COMP;
353 images.image: "shine.png" COMP; 354 images.image: "shine.png" COMP;
354 parts { 355 parts {
355 rect { "event";
356 desc { "default";
357 color: 0 0 0 0;
358 }
359 desc { "disabled";
360 inherit: "default";
361 hid;
362 }
363 }
364 rect { "base"; nomouse; 356 rect { "base"; nomouse;
365 desc { "default"; 357 desc { "default";
366 color: 64 64 64 255; 358 color: 64 64 64 255;
@@ -425,6 +417,15 @@ group { "efl/list_item:placeholder"; data.item: "version" "123";
425 vis; 417 vis;
426 } 418 }
427 } 419 }
420 rect { "event";
421 desc { "default";
422 color: 0 0 0 0;
423 }
424 desc { "disabled";
425 inherit: "default";
426 hid;
427 }
428 }
428 //##// 429 //##//
429 swallow { "efl.content"; mouse; 430 swallow { "efl.content"; mouse;
430 scale; 431 scale;
@@ -463,6 +464,7 @@ group { "efl/list_item:placeholder"; data.item: "version" "123";
463 } 464 }
464 } 465 }
465 programs { 466 programs {
467 EFL_UI_CLICKABLE_PART_BIND("event")
466 program { 468 program {
467 signal: "efl,state,odd"; source: "efl"; 469 signal: "efl,state,odd"; source: "efl";
468 action: STATE_SET "odd"; 470 action: STATE_SET "odd";