summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-10-08 16:11:52 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-02-03 17:16:06 +0100
commit02245a2494ea27e14cd6390f00c0989ed568663f (patch)
tree9b0416e0414432302531e27126267b4b3440715b
parent566831e3e22fb198e55db312c0d2d5ece13552a8 (diff)
theme: rework a bit the tab_pager theme
the theme now works in a way where the current tab is in one color with the content, so its correctly assosiated. The not selected items are in a bit more gray setting so its meant to be in the background. https://pasteboard.co/IB1UV8o.png Differential Revision: https://phab.enlightenment.org/D10305
-rw-r--r--data/elementary/objects/test_tab_pager.edc9
-rw-r--r--data/elementary/themes/edc/efl/tab_bar.edc139
2 files changed, 10 insertions, 138 deletions
diff --git a/data/elementary/objects/test_tab_pager.edc b/data/elementary/objects/test_tab_pager.edc
index 95715713ae..c4ae78b703 100644
--- a/data/elementary/objects/test_tab_pager.edc
+++ b/data/elementary/objects/test_tab_pager.edc
@@ -45,19 +45,12 @@ collections {
45 desc { "default"; 45 desc { "default";
46 } 46 }
47 } 47 }
48 rect { "bg";
49 scale;
50 desc { "default";
51 rel.to: "base";
52 color: 255 255 255 255;
53 }
54 }
55 text { "text"; 48 text { "text";
56 scale; 49 scale;
57 desc { "default"; 50 desc { "default";
58 rel.to: "base"; 51 rel.to: "base";
59 align: 0.5 0.5; 52 align: 0.5 0.5;
60 color: 0 0 0 255; 53 color: 255 255 255 255;
61 text.size: 20; 54 text.size: 20;
62 } 55 }
63 } 56 }
diff --git a/data/elementary/themes/edc/efl/tab_bar.edc b/data/elementary/themes/edc/efl/tab_bar.edc
index 8f1a10549e..cd4a51cc55 100644
--- a/data/elementary/themes/edc/efl/tab_bar.edc
+++ b/data/elementary/themes/edc/efl/tab_bar.edc
@@ -2,7 +2,6 @@ group { "efl/tab_bar";
2 data.item: "version" "123"; 2 data.item: "version" "123";
3 images.image: "vgrad_med_lighter.png" COMP; 3 images.image: "vgrad_med_lighter.png" COMP;
4 images.image: "bevel_out.png" COMP; 4 images.image: "bevel_out.png" COMP;
5 images.image: "shine.png" COMP;
6 images.image: "shadow_square_tiny.png" COMP; 5 images.image: "shadow_square_tiny.png" COMP;
7 parts { 6 parts {
8 spacer { "base"; 7 spacer { "base";
@@ -10,53 +9,12 @@ group { "efl/tab_bar";
10 desc { "default"; 9 desc { "default";
11 } 10 }
12 } 11 }
13 image { "shadow";
14 nomouse;
15 desc { "default";
16 rel.to: "base";
17 rel1.offset: -3 -2;
18 rel2.offset: 2 3;
19 image.normal: "shadow_square_tiny.png";
20 image.border: 6 6 6 6;
21 fill.smooth: 0;
22 }
23 }
24 image { "bg";
25 desc { "default";
26 rel.to: "base";
27 image.normal: "vgrad_med_lighter.png";
28 rel1.offset: 0 0;
29 rel2.offset: -1 -1;
30 fill.smooth: 0;
31 }
32 }
33 swallow { "efl.content"; 12 swallow { "efl.content";
34 scale; 13 scale;
35 desc { "default"; 14 desc { "default";
36 rel.to: "base"; 15 rel.to: "base";
37 } 16 }
38 } 17 }
39 image { "bevel";
40 nomouse;
41 desc { "default";
42 rel.to: "base";
43 image.normal: "bevel_out.png";
44 image.border: 1 1 1 1;
45 image.middle: 0;
46 fill.smooth: 0;
47 }
48 }
49 image { "shine";
50 nomouse;
51 desc { "default";
52 image.normal: "shine.png";
53 rel.to: "base";
54 rel1.offset: 0 -2;
55 rel2.relative: 1.0 0.0;
56 rel2.offset: -1 2;
57 FIXED_SIZE(69, 5)
58 }
59 }
60 } 18 }
61} 19}
62 20
@@ -134,64 +92,20 @@ group { "efl/tab_bar/tab";
134 desc { "default"; 92 desc { "default";
135 } 93 }
136 desc { "vert"; 94 desc { "vert";
137 rel1.offset: -1 0;
138 rel2.offset: 0 -1;
139 } 95 }
140 } 96 }
141 image { "shadow1"; 97 rect { "shadow1";
142 nomouse; 98 nomouse;
143 desc { "default"; 99 desc { "default";
144 rel.to: "base"; 100 rel.to: "base";
145 image.normal: "shadow_inset_bevels.png"; 101 rel2.offset: 0 0;
146 image.border: 2 2 0 1; 102 color: 0 0 0 50;
147 hid;
148 }
149 desc { "selected";
150 inherit: "default";
151 vis; 103 vis;
152 } 104 }
153 }
154 image { "shadow2";
155 nomouse;
156 desc { "default";
157 rel.to: "shadow1";
158 rel1.offset: 1 0;
159 rel2.offset: -2 -1;
160 image.normal: "shadow_angled_in_sides.png";
161 image.border: 8 8 0 1;
162 image.middle: 0;
163 hid;
164 }
165 desc { "selected"; 105 desc { "selected";
166 inherit: "default"; 106 inherit: "default";
167 vis;
168 }
169 }
170 rect { "bend_clip";
171 desc { "default";
172 hid; 107 hid;
173 } 108 }
174 desc { "vert";
175 vis;
176 }
177 }
178 image { "bend";
179 clip_to: "bend_clip";
180 desc { "default";
181 min: 2 2;
182 max: 99999 2;
183 rel2.offset: -1 1;
184 rel2.relative: 1.0 0.0;
185 image.normal: "bevel_dark_in.png";
186 image.border: 2 2 2 2;
187 fill.smooth: 0;
188 hid;
189 fixed: 1 1;
190 }
191 desc { "selected";
192 inherit: "default";
193 vis;
194 }
195 } 109 }
196 rect { "icon_clip"; 110 rect { "icon_clip";
197 desc { "default"; 111 desc { "default";
@@ -384,30 +298,12 @@ group { "efl/tab_bar/tab";
384 nomouse; 298 nomouse;
385 desc { "default"; 299 desc { "default";
386 fixed: 0 1; 300 fixed: 0 1;
387 rel1.offset: -3 -7; 301 rel1.relative: 0.0 0.0;
388 rel1.relative: 0.0 1.0; 302 rel1.to: "shadow1";
389 rel1.to: "shadow2"; 303 rel1.offset: -2 -2;
390 rel2.offset: 2 2; 304 rel2.relative: 1.0 0.0;
391 rel2.to: "shadow2"; 305 rel2.offset: 0 7;
392 image.normal: "horizontal_separated_bar_small_glow.png"; 306 rel2.to: "shadow1";
393 image.border: 4 4 4 4;
394 fill.smooth: 0;
395 hid;
396 }
397 desc { "selected";
398 inherit: "default";
399 vis;
400 }
401 }
402 image { "highlight";
403 nomouse;
404 desc { "default";
405 fixed: 0 1;
406 rel1.offset: -3 -7;
407 rel1.relative: 0.0 1.0;
408 rel1.to: "shadow2";
409 rel2.offset: 2 2;
410 rel2.to: "shadow2";
411 image.normal: "horizontal_separated_bar_small_glow.png"; 307 image.normal: "horizontal_separated_bar_small_glow.png";
412 image.border: 4 4 4 4; 308 image.border: 4 4 4 4;
413 fill.smooth: 0; 309 fill.smooth: 0;
@@ -439,13 +335,11 @@ group { "efl/tab_bar/tab";
439 signal: "efl,state,horizontal"; source: "efl"; 335 signal: "efl,state,horizontal"; source: "efl";
440 action: STATE_SET "default" 0.0; 336 action: STATE_SET "default" 0.0;
441 target: "base"; 337 target: "base";
442 target: "bend_clip";
443 } 338 }
444 program { 339 program {
445 signal: "efl,state,vertical"; source: "efl"; 340 signal: "efl,state,vertical"; source: "efl";
446 action: STATE_SET "vert" 0.0; 341 action: STATE_SET "vert" 0.0;
447 target: "base"; 342 target: "base";
448 target: "bend_clip";
449 } 343 }
450 program { name: "st0"; 344 program { name: "st0";
451 signal: "load"; source: ""; 345 signal: "load"; source: "";
@@ -459,9 +353,7 @@ group { "efl/tab_bar/tab";
459 target: "efl.text"; 353 target: "efl.text";
460 target: "label2"; 354 target: "label2";
461 target: "shadow1"; 355 target: "shadow1";
462 target: "shadow2";
463 target: "bar"; 356 target: "bar";
464 target: "bend";
465 } 357 }
466 program { 358 program {
467 signal: "efl,state,unselected"; source: "efl"; 359 signal: "efl,state,unselected"; source: "efl";
@@ -469,19 +361,7 @@ group { "efl/tab_bar/tab";
469 target: "efl.text"; 361 target: "efl.text";
470 target: "label2"; 362 target: "label2";
471 target: "shadow1"; 363 target: "shadow1";
472 target: "shadow2";
473 target: "bar"; 364 target: "bar";
474 target: "bend";
475 }
476 program {
477 signal: "efl,highlight,on"; source: "efl";
478 action: STATE_SET "selected" 0.0;
479 target: "highlight";
480 }
481 program {
482 signal: "efl,highlight,off"; source: "efl";
483 action: STATE_SET "default" 0.0;
484 target: "highlight";
485 } 365 }
486 program { name: "st1"; 366 program { name: "st1";
487 signal: "efl,text,unset"; source: "efl"; 367 signal: "efl,text,unset"; source: "efl";
@@ -535,7 +415,6 @@ group { "efl/tab_bar/tab";
535 signal: "efl,state,moving"; source: "efl"; 415 signal: "efl,state,moving"; source: "efl";
536 action: STATE_SET "default" 0.0; 416 action: STATE_SET "default" 0.0;
537 target: "shadow1"; 417 target: "shadow1";
538 target: "shadow2";
539 } 418 }
540 program { name: "icon_set,animation"; 419 program { name: "icon_set,animation";
541 signal: "efl,state,icon_new,set"; source: "efl"; 420 signal: "efl,state,icon_new,set"; source: "efl";