summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/elementary/themes/colorclasses.edc2
-rw-r--r--data/elementary/themes/edc/elm/scroller.edc55
-rw-r--r--data/elementary/themes/edc/scrollframe.edc2
3 files changed, 33 insertions, 26 deletions
diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc
index c2af19b86b..e610e0d5b6 100644
--- a/data/elementary/themes/colorclasses.edc
+++ b/data/elementary/themes/colorclasses.edc
@@ -66,6 +66,8 @@ color_classes {
66 color_class { name: "/fg/normal/pointer/manipulator"; 66 color_class { name: "/fg/normal/pointer/manipulator";
67 color: 51 153 255 192; } 67 color: 51 153 255 192; }
68/////////////////////////////////////////////////////////////////////////////// 68///////////////////////////////////////////////////////////////////////////////
69 color_class { name: "/bg/normal/scroller/base";
70 color: 0 0 0 0; }
69 color_class { name: "/fg/normal/scroller/bar"; 71 color_class { name: "/fg/normal/scroller/bar";
70 color: 51 153 255 255; } 72 color: 51 153 255 255; }
71/////////////////////////////////////////////////////////////////////////////// 73///////////////////////////////////////////////////////////////////////////////
diff --git a/data/elementary/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc
index d4ba02dcb2..540eef1825 100644
--- a/data/elementary/themes/edc/elm/scroller.edc
+++ b/data/elementary/themes/edc/elm/scroller.edc
@@ -23,7 +23,7 @@ group { name: "elm/scroller/base/default";
23 part { name: "bg"; type: RECT; 23 part { name: "bg"; type: RECT;
24 description { state: "default" 0.0; 24 description { state: "default" 0.0;
25 rel.to: "elm.swallow.background"; 25 rel.to: "elm.swallow.background";
26 color: 0 0 0 0; 26 color_class: "/bg/normal/scroller/base";
27 } 27 }
28 } 28 }
29 part { name: "clipper"; type: RECT; 29 part { name: "clipper"; type: RECT;
@@ -57,7 +57,8 @@ group { name: "elm/scroller/base/default";
57 scale: 1; 57 scale: 1;
58 clip_to: "sh_clip"; 58 clip_to: "sh_clip";
59 description { state: "default" 0.0; 59 description { state: "default" 0.0;
60 color: 255 255 255 0; 60 color_class: "/shadow/normal/scroller";
61 color: 255 255 255 0; // no cc
61 rel.to: "elm.swallow.content"; 62 rel.to: "elm.swallow.content";
62 rel1.offset: 0 -1; 63 rel1.offset: 0 -1;
63 rel2.offset: -1 -1; 64 rel2.offset: -1 -1;
@@ -68,7 +69,7 @@ group { name: "elm/scroller/base/default";
68 } 69 }
69 description { state: "visible" 0.0; 70 description { state: "visible" 0.0;
70 inherit: "default" 0.0; 71 inherit: "default" 0.0;
71 color: 255 255 255 128; 72 color: 255 255 255 255; // no cc
72 rel1.offset: 0 -16; 73 rel1.offset: 0 -16;
73 rel2.offset: -1 15; 74 rel2.offset: -1 15;
74 visible: 1; 75 visible: 1;
@@ -89,7 +90,8 @@ group { name: "elm/scroller/base/default";
89 scale: 1; 90 scale: 1;
90 clip_to: "sh_clip"; 91 clip_to: "sh_clip";
91 description { state: "default" 0.0; 92 description { state: "default" 0.0;
92 color: 255 255 255 0; 93 color_class: "/shadow/normal/scroller";
94 color: 255 255 255 0; // no cc
93 rel.to: "elm.swallow.content"; 95 rel.to: "elm.swallow.content";
94 rel1.relative: 0.0 1.0; 96 rel1.relative: 0.0 1.0;
95 rel1.offset: 0 0; 97 rel1.offset: 0 0;
@@ -100,7 +102,7 @@ group { name: "elm/scroller/base/default";
100 } 102 }
101 description { state: "visible" 0.0; 103 description { state: "visible" 0.0;
102 inherit: "default" 0.0; 104 inherit: "default" 0.0;
103 color: 255 255 255 128; 105 color: 255 255 255 255; // no cc
104 rel1.offset: 0 -16; 106 rel1.offset: 0 -16;
105 rel2.offset: -1 15; 107 rel2.offset: -1 15;
106 visible: 1; 108 visible: 1;
@@ -121,7 +123,8 @@ group { name: "elm/scroller/base/default";
121 scale: 1; 123 scale: 1;
122 clip_to: "sh_clip"; 124 clip_to: "sh_clip";
123 description { state: "default" 0.0; 125 description { state: "default" 0.0;
124 color: 255 255 255 0; 126 color_class: "/shadow/normal/scroller";
127 color: 255 255 255 0; // no cc
125 rel.to: "elm.swallow.content"; 128 rel.to: "elm.swallow.content";
126 rel1.offset: -1 0; 129 rel1.offset: -1 0;
127 rel2.offset: -1 -1; 130 rel2.offset: -1 -1;
@@ -132,7 +135,7 @@ group { name: "elm/scroller/base/default";
132 } 135 }
133 description { state: "visible" 0.0; 136 description { state: "visible" 0.0;
134 inherit: "default" 0.0; 137 inherit: "default" 0.0;
135 color: 255 255 255 128; 138 color: 255 255 255 255; // no cc
136 rel1.offset: -16 0; 139 rel1.offset: -16 0;
137 rel2.offset: 15 -1; 140 rel2.offset: 15 -1;
138 visible: 1; 141 visible: 1;
@@ -153,7 +156,8 @@ group { name: "elm/scroller/base/default";
153 scale: 1; 156 scale: 1;
154 clip_to: "sh_clip"; 157 clip_to: "sh_clip";
155 description { state: "default" 0.0; 158 description { state: "default" 0.0;
156 color: 255 255 255 0; 159 color_class: "/shadow/normal/scroller";
160 color: 255 255 255 0; // no cc
157 rel.to: "elm.swallow.content"; 161 rel.to: "elm.swallow.content";
158 rel1.relative: 1.0 0.0; 162 rel1.relative: 1.0 0.0;
159 rel1.offset: 0 0; 163 rel1.offset: 0 0;
@@ -164,7 +168,7 @@ group { name: "elm/scroller/base/default";
164 } 168 }
165 description { state: "visible" 0.0; 169 description { state: "visible" 0.0;
166 inherit: "default" 0.0; 170 inherit: "default" 0.0;
167 color: 255 255 255 128; 171 color: 255 255 255 255; // no cc
168 rel1.offset: -16 0; 172 rel1.offset: -16 0;
169 rel2.offset: 15 -1; 173 rel2.offset: 15 -1;
170 visible: 1; 174 visible: 1;
@@ -217,7 +221,7 @@ group { name: "elm/scroller/base/default";
217 part { name: "sb_vbar_p1"; type: RECT; 221 part { name: "sb_vbar_p1"; type: RECT;
218 clip_to: "sb_vbar"; 222 clip_to: "sb_vbar";
219 description { state: "default" 0.0; 223 description { state: "default" 0.0;
220 color: 0 0 0 0; 224 color: 0 0 0 0; // no cc
221 rel1.to: "sb_vbar"; 225 rel1.to: "sb_vbar";
222 rel2.relative: 1.0 0.0; 226 rel2.relative: 1.0 0.0;
223 rel2.to: "elm.dragable.vbar"; 227 rel2.to: "elm.dragable.vbar";
@@ -227,7 +231,7 @@ group { name: "elm/scroller/base/default";
227 part { name: "sb_vbar_p2"; type: RECT; 231 part { name: "sb_vbar_p2"; type: RECT;
228 clip_to: "sb_vbar"; 232 clip_to: "sb_vbar";
229 description { state: "default" 0.0; 233 description { state: "default" 0.0;
230 color: 0 0 0 0; 234 color: 0 0 0 0; // no cc
231 rel1.relative: 0.0 1.0; 235 rel1.relative: 0.0 1.0;
232 rel1.to: "elm.dragable.vbar"; 236 rel1.to: "elm.dragable.vbar";
233 rel2.to: "sb_vbar"; 237 rel2.to: "sb_vbar";
@@ -247,7 +251,7 @@ group { name: "elm/scroller/base/default";
247 rel1.to: "sb_vbar"; 251 rel1.to: "sb_vbar";
248 rel2.relative: 0.5 0.5; 252 rel2.relative: 0.5 0.5;
249 rel2.to: "sb_vbar"; 253 rel2.to: "sb_vbar";
250 color: 0 0 0 0; 254 color: 0 0 0 0; // no cc
251 } 255 }
252 description { state: "hidden" 0.0; 256 description { state: "hidden" 0.0;
253 inherit: "default" 0.0; 257 inherit: "default" 0.0;
@@ -261,7 +265,7 @@ group { name: "elm/scroller/base/default";
261 repeat_events: 1; 265 repeat_events: 1;
262 scale: 1; 266 scale: 1;
263 description { state: "default" 0.0; 267 description { state: "default" 0.0;
264 color: 0 0 0 0; 268 color: 0 0 0 0; // no cc
265 rel1.to: "sb_vbar"; 269 rel1.to: "sb_vbar";
266 rel1.offset: -45 0; 270 rel1.offset: -45 0;
267 rel2.to: "sb_vbar"; 271 rel2.to: "sb_vbar";
@@ -419,7 +423,7 @@ group { name: "elm/scroller/base/default";
419 part { name: "sb_hbar_p1"; type: RECT; 423 part { name: "sb_hbar_p1"; type: RECT;
420 clip_to: "sb_hbar"; 424 clip_to: "sb_hbar";
421 description { state: "default" 0.0; 425 description { state: "default" 0.0;
422 color: 0 0 0 0; 426 color: 0 0 0 0; // no cc
423 rel1.to: "sb_hbar"; 427 rel1.to: "sb_hbar";
424 rel2.relative: 0.0 1.0; 428 rel2.relative: 0.0 1.0;
425 rel2.to: "elm.dragable.hbar"; 429 rel2.to: "elm.dragable.hbar";
@@ -429,7 +433,7 @@ group { name: "elm/scroller/base/default";
429 part { name: "sb_hbar_p2"; type: RECT; 433 part { name: "sb_hbar_p2"; type: RECT;
430 clip_to: "sb_hbar"; 434 clip_to: "sb_hbar";
431 description { state: "default" 0.0; 435 description { state: "default" 0.0;
432 color: 0 0 0 0; 436 color: 0 0 0 0; // no cc
433 rel1.relative: 1.0 0.0; 437 rel1.relative: 1.0 0.0;
434 rel1.to: "elm.dragable.hbar"; 438 rel1.to: "elm.dragable.hbar";
435 rel2.to: "sb_hbar"; 439 rel2.to: "sb_hbar";
@@ -449,7 +453,7 @@ group { name: "elm/scroller/base/default";
449 rel1.to: "sb_hbar"; 453 rel1.to: "sb_hbar";
450 rel2.relative: 0.5 0.5; 454 rel2.relative: 0.5 0.5;
451 rel2.to: "sb_hbar"; 455 rel2.to: "sb_hbar";
452 color: 0 0 0 0; 456 color: 0 0 0 0; // no cc
453 } 457 }
454 description { state: "hidden" 0.0; 458 description { state: "hidden" 0.0;
455 inherit: "default" 0.0; 459 inherit: "default" 0.0;
@@ -463,7 +467,7 @@ group { name: "elm/scroller/base/default";
463 repeat_events: 1; 467 repeat_events: 1;
464 scale: 1; 468 scale: 1;
465 description { state: "default" 0.0; 469 description { state: "default" 0.0;
466 color: 0 0 0 0; 470 color: 0 0 0 0; // no cc
467 rel1.to: "sb_hbar"; 471 rel1.to: "sb_hbar";
468 rel1.offset: 0 -45; 472 rel1.offset: 0 -45;
469 rel2.to: "sb_hbar"; 473 rel2.to: "sb_hbar";
@@ -597,15 +601,15 @@ group { name: "elm/scroller/base/default";
597 clip_to: "sb_vbar_show"; 601 clip_to: "sb_vbar_show";
598 description { state: "default" 0.0; 602 description { state: "default" 0.0;
599 fixed: 1 1; 603 fixed: 1 1;
600 color: 51 153 255 255; 604 color_class: "/fg/normal/scroller/bar/vertical";
601 } 605 }
602 description { state: "disabled" 0.0; 606 description { state: "disabled" 0.0;
603 inherit: "default" 0.0; 607 inherit: "default" 0.0;
604 color: 80 80 80 255; 608 color_class: "/fg/disabled/scroller/bar/vertical";
605 } 609 }
606 description { state: "clicked" 0.0; 610 description { state: "clicked" 0.0;
607 inherit: "default" 0.0; 611 inherit: "default" 0.0;
608 color: 255 255 255 255; 612 color_class: "/fg/pressed/scroller/bar/vertical";
609 } 613 }
610 } 614 }
611 615
@@ -631,15 +635,15 @@ group { name: "elm/scroller/base/default";
631 clip_to: "sb_hbar_show"; 635 clip_to: "sb_hbar_show";
632 description { state: "default" 0.0; 636 description { state: "default" 0.0;
633 fixed: 1 1; 637 fixed: 1 1;
634 color: 51 153 255 255; 638 color_class: "/fg/normal/scroller/bar/horizontal";
635 } 639 }
636 description { state: "disabled" 0.0; 640 description { state: "disabled" 0.0;
637 inherit: "default" 0.0; 641 inherit: "default" 0.0;
638 color: 80 80 80 255; 642 color_class: "/fg/disabled/scroller/bar/horizontal";
639 } 643 }
640 description { state: "clicked" 0.0; 644 description { state: "clicked" 0.0;
641 inherit: "default" 0.0; 645 inherit: "default" 0.0;
642 color: 255 255 255 255; 646 color_class: "/fg/pressed/scroller/bar/horizontal";
643 } 647 }
644 } 648 }
645 649
@@ -664,10 +668,11 @@ group { name: "elm/scroller/base/default";
664 668
665 part { name: "dim_effect"; type: RECT; mouse_events: 0; 669 part { name: "dim_effect"; type: RECT; mouse_events: 0;
666 description { state: "default" 0.0; 670 description { state: "default" 0.0;
667 color: 0 0 0 0; 671 color: 32 32 32 0; // no cc
672 visible: 0;
668 } 673 }
669 description { state: "effect" 0.0; 674 description { state: "effect" 0.0;
670 color: 32 32 32 255; 675 color: 32 32 32 255; // no cc
671 } 676 }
672 } 677 }
673 } 678 }
diff --git a/data/elementary/themes/edc/scrollframe.edc b/data/elementary/themes/edc/scrollframe.edc
index e612ab2e6a..409f40ef68 100644
--- a/data/elementary/themes/edc/scrollframe.edc
+++ b/data/elementary/themes/edc/scrollframe.edc
@@ -66,7 +66,7 @@ group { name: "e/widgets/scrollframe";
66 part { name: "bg"; type: RECT; 66 part { name: "bg"; type: RECT;
67 description { state: "default" 0.0; 67 description { state: "default" 0.0;
68 rel.to: "e.swallow.content"; 68 rel.to: "e.swallow.content";
69 color: 0 0 0 0; // no cc 69 color_class: "/bg/normal/scroller/base";
70 } 70 }
71 } 71 }
72 part { name: "clipper"; type: RECT; 72 part { name: "clipper"; type: RECT;