diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index 82c3374c0d..89e5bae56d 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -415,6 +415,15 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/selected/edgebindings/edge"; color: 51 153 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/bg/normal/gadgets/control/base"; + color: 51 153 255 255; } + color_class { name: "/bg/normal/gadgets/control/outline"; + color: 51 153 255 255; } + color_class { name: "/bg/selected/gadgets/control/outline"; + color: 255 255 255 255; } + color_class { name: "/bg/selected/gadgets/control/arrow"; + color: 51 153 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/gadgets/ibar/text/text"; color: 255 255 255 255; } diff --git a/data/elementary/themes/edc/button.edc b/data/elementary/themes/edc/button.edc index c0cd5b0341..09d15d3f05 100644 --- a/data/elementary/themes/edc/button.edc +++ b/data/elementary/themes/edc/button.edc @@ -122,7 +122,7 @@ group { name: "e/widgets/button"; ignore_flags: ON_HOLD; description { state: "default" 0.0; rel.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/colors.edc b/data/elementary/themes/edc/colors.edc index 5a8e62da20..f00bbaaf06 100644 --- a/data/elementary/themes/edc/colors.edc +++ b/data/elementary/themes/edc/colors.edc @@ -74,7 +74,7 @@ group { name: "e/modules/conf_colors/preview/unknown"; } part { name: "c1"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 255 0 0 128; + color: 255 0 0 128; // no cc color_class: "color_preview_c1"; rel.to: "pat"; rel2.relative: 0.333 1.0; @@ -82,7 +82,7 @@ group { name: "e/modules/conf_colors/preview/unknown"; } part { name: "c2"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 255 0 128; + color: 0 255 0 128; // no cc color_class: "color_preview_c2"; rel1.to: "c1"; rel1.relative: 1.0 0.0; @@ -92,7 +92,7 @@ group { name: "e/modules/conf_colors/preview/unknown"; } part { name: "c3"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 255 128; + color: 0 0 255 128; // no cc color_class: "color_preview_c3"; rel1.to: "c2"; rel1.relative: 1.0 0.0; diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc index e1b2f18607..0a29fa72b7 100644 --- a/data/elementary/themes/edc/comp_compat.edc +++ b/data/elementary/themes/edc/comp_compat.edc @@ -321,12 +321,12 @@ group { name: "e/comp/border/fullscreen"; } part { name: "scr_shade"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 255; + color: 0 0 0 255; // no cc visible: 1; } } @@ -358,17 +358,17 @@ group { name: "e/comp/border/fullscreen"; part { name: "fader"; type: RECT; description { state: "default" 0.0; rel.to: "e.swallow.content"; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible1" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } description { state: "visible2" 0.0; inherit: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } } diff --git a/data/elementary/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc index 9485de8744..56dbdb7171 100644 --- a/data/elementary/themes/edc/connman.edc +++ b/data/elementary/themes/edc/connman.edc @@ -326,7 +326,7 @@ group { name: "e/modules/connman/main"; } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } diff --git a/data/elementary/themes/edc/cslider.edc b/data/elementary/themes/edc/cslider.edc index 2bdae4fa28..f2dbccf22e 100644 --- a/data/elementary/themes/edc/cslider.edc +++ b/data/elementary/themes/edc/cslider.edc @@ -48,7 +48,7 @@ group { name: "e/widgets/cslider"; rel1.to_y: "e.swallow.content"; rel2.to_x: "e.dragable.cursor"; rel2.to_y: "e.swallow.content"; - color: 255 255 255 192; + color: 255 255 255 192; // no cc } description { state: "vertical" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc index 71a1abaa6d..aa697c977b 100644 --- a/data/elementary/themes/edc/deskmirror.edc +++ b/data/elementary/themes/edc/deskmirror.edc @@ -336,7 +336,7 @@ group { name: "e/deskmirror/frame/tiling"; } part { name: "frame"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.offset: -1 -1; rel2.offset: 0 0; color_class: "/bg/selected/border/outline"; diff --git a/data/elementary/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc index aa401f5507..0bd78467ab 100644 --- a/data/elementary/themes/edc/fileman.edc +++ b/data/elementary/themes/edc/fileman.edc @@ -876,7 +876,7 @@ group { name: "e/fileman/default/overlay"; } description { state: "active" 0.0; visible: 1; - color: 255 255 255 255; // mo cc + color: 255 255 255 255; // no cc } } part { name: "busy_clip"; type: RECT; diff --git a/data/elementary/themes/edc/gadman.edc b/data/elementary/themes/edc/gadman.edc index 04b87f57af..5e09acb9ca 100644 --- a/data/elementary/themes/edc/gadman.edc +++ b/data/elementary/themes/edc/gadman.edc @@ -4,7 +4,7 @@ group { name: "e/gadman/popup"; parts { part { name: "bg"; type: RECT; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/gadgets/popup"; } } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip"; @@ -26,20 +26,21 @@ group { name: "e/gadman/full_bg"; parts { part { name: "bg"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 0; + color: 255 255 255 0; // no cc + color_class: "/dim/normal/gadgets/full-bg"; visible: 0; } description { state: "visible" 0.0; - color: 0 0 0 192; + color: 255 255 255 255; // no cc } } part { name: "custom_bg"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; - color: 255 255 255 200; + color: 255 255 255 255; // no cc } } part { name: "e.swallow.bg"; type: SWALLOW; mouse_events: 0; @@ -49,7 +50,7 @@ group { name: "e/gadman/full_bg"; } part { name: "grabber"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -103,9 +104,11 @@ group { name: "e/gadman/full_bg"; group { name: "e/gadman/frame"; parts { part { name: "e.swallow.content"; type: SWALLOW; + scale: 1; description { state: "default" 0.0; rel1.offset: 4 4; rel2.offset: -5 -5; + offscale; } } } @@ -115,19 +118,6 @@ group { name: "e/gadman/control"; images.image: "outline.png" COMP; images.image: "diagonal_stripes.png" COMP; parts { - part { name: "base"; mouse_events: 0; - description { state: "default" 0.0; - image.normal: "outline.png"; - image.border: 4 4 4 4; - image.middle: 0; - fill.smooth: 0; - color: 51 153 255 255; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } part { name: "pat"; mouse_events: 0; description { state: "default" 0.0; rel1.to: "base"; @@ -135,10 +125,23 @@ group { name: "e/gadman/control"; rel2.offset: -2 -2; rel2.to: "base"; image.normal: "diagonal_stripes.png"; - color: 51 153 255 25; + color_class: "/bg/normal/gadgets/control/base"; TILED_PATTERN(240, 240) } } + part { name: "base"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "outline.png"; + image.border: 4 4 4 4; + image.middle: 0; + fill.smooth: 0; + color_class: "/bg/normal/gadgets/control/outline"; + } + description { state: "active" 0.0; + inherit: "default" 0.0; + color_class: "/bg/selected/gadgets/control/outline"; + } + } part { name: "av10"; mouse_events: 0; scale; description { state: "default" 0.0; @@ -147,7 +150,7 @@ group { name: "e/gadman/control"; rel2.relative: 1.0 0.0; rel2.to: "resizev1"; image.normal: "i-arrow-u"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -159,7 +162,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel2.relative: 1.0 -5.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "av11"; mouse_events: 0; @@ -170,7 +173,7 @@ group { name: "e/gadman/control"; rel1.relative: 0.0 1.0; rel2.to: "resizev1"; image.normal: "i-arrow-d"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -182,7 +185,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel1.relative: 0.0 6.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "av20"; mouse_events: 0; @@ -193,7 +196,7 @@ group { name: "e/gadman/control"; rel2.relative: 1.0 0.0; rel2.to: "resizev2"; image.normal: "i-arrow-u"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -205,7 +208,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel2.relative: 1.0 -5.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "av21"; mouse_events: 0; @@ -216,7 +219,7 @@ group { name: "e/gadman/control"; rel1.relative: 0.0 1.0; rel2.to: "resizev2"; image.normal: "i-arrow-d"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -228,7 +231,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel1.relative: 0.0 6.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "ah10"; mouse_events: 0; @@ -239,7 +242,7 @@ group { name: "e/gadman/control"; rel2.relative: 0.0 1.0; rel2.to: "resizeh1"; image.normal: "i-arrow-l"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -251,7 +254,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel2.relative: -5.0 1.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "ah11"; mouse_events: 0; @@ -262,7 +265,7 @@ group { name: "e/gadman/control"; rel1.relative: 1.0 0.0; rel2.to: "resizeh1"; image.normal: "i-arrow-r"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -274,7 +277,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel1.relative: 6.0 0.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "ah20"; mouse_events: 0; @@ -285,7 +288,7 @@ group { name: "e/gadman/control"; rel2.relative: 0.0 1.0; rel2.to: "resizeh2"; image.normal: "i-arrow-l"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -297,7 +300,7 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel2.relative: -5.0 1.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "ah21"; mouse_events: 0; @@ -308,7 +311,7 @@ group { name: "e/gadman/control"; rel1.relative: 1.0 0.0; rel2.to: "resizeh2"; image.normal: "i-arrow-r"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/control/arrow"; visible: 0; FIXED_SIZE(15, 15) } @@ -320,14 +323,14 @@ group { name: "e/gadman/control"; inherit: "default" 0.0; visible: 1; rel1.relative: 6.0 0.0; - color: 51 153 255 0; + color: 255 255 255 0; // no cc } } part { name: "move"; type: RECT; description { state: "default" 0.0; rel1.to: "base"; rel2.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "off" 0.0; inherit: "default" 0.0; @@ -341,7 +344,7 @@ group { name: "e/gadman/control"; rel2.relative: 1.0 0.5; align: 0.5 0.0; max: 99999 7; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "off" 0.0; inherit: "default" 0.0; @@ -355,7 +358,7 @@ group { name: "e/gadman/control"; rel1.relative: 0.0 0.5; align: 0.5 1.0; max: 99999 7; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "off" 0.0; inherit: "default" 0.0; @@ -369,7 +372,7 @@ group { name: "e/gadman/control"; rel2.relative: 0.5 1.0; align: 0.0 0.5; max: 7 99999; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "off" 0.0; inherit: "default" 0.0; @@ -383,7 +386,7 @@ group { name: "e/gadman/control"; rel1.relative: 0.5 0.0; align: 1.0 0.5; max: 7 99999; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "off" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc index 2336666fce..f21ced5608 100644 --- a/data/elementary/themes/edc/ibar-ibox.edc +++ b/data/elementary/themes/edc/ibar-ibox.edc @@ -855,13 +855,13 @@ group { name: "e/modules/ibar/menu/item"; } description { state: "otherdesk"; inherit: "default" 0.0; - color: 32 32 32 255; + color: 32 32 32 255; // no cc // commented out link.base: "e,state,other,desk" "e"; link.transition: ACCEL 0.1; } description { state: "otherscreen"; inherit: "default" 0.0; - color: 32 32 32 255; + color: 32 32 32 255; // no cc // commented out link.base: "e,state,other,screen" "e"; link.transition: ACCEL 0.1; } diff --git a/data/elementary/themes/edc/ilist.edc b/data/elementary/themes/edc/ilist.edc index 403b7a4696..55dd96d5af 100644 --- a/data/elementary/themes/edc/ilist.edc +++ b/data/elementary/themes/edc/ilist.edc @@ -129,7 +129,7 @@ group { name: "e/widgets/ilist"; } part { name: "event"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/notification.edc b/data/elementary/themes/edc/notification.edc index a59443ba98..0e226b8b58 100644 --- a/data/elementary/themes/edc/notification.edc +++ b/data/elementary/themes/edc/notification.edc @@ -169,7 +169,7 @@ group { name: "e/modules/notification/main"; rel2.offset: -13 12; align: 1.0 0.0; min: 15 15; - color: 0 0 0 0; + color: 0 0 0 0; // no cc fixed: 1 1; offscale; } diff --git a/data/elementary/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc index 73da9978d2..d74322ebfe 100644 --- a/data/elementary/themes/edc/randr.edc +++ b/data/elementary/themes/edc/randr.edc @@ -466,7 +466,7 @@ group { name: "e/conf/randr/main/frame"; part { name: "e.event.resize"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc max: 21 21; align: 1.0 1.0; }