raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a639e506657665085bff3c9bb86a32243f3eef80
commit a639e506657665085bff3c9bb86a32243f3eef80 Author: Carsten Haitzler <[email protected]> Date: Wed Sep 29 19:04:53 2021 +0100 elm theme - more cc --- data/elementary/themes/colorclasses.edc | 6 +- data/elementary/themes/edc/efl/pointer.edc | 5 +- data/elementary/themes/edc/efl/popup.edc | 32 ++++----- data/elementary/themes/edc/efl/progress.edc | 99 +++++++++++++--------------- data/elementary/themes/edc/efl/radio.edc | 69 ++++++++++++++----- data/elementary/themes/edc/efl/scroller.edc | 90 ++++++++++++------------- data/elementary/themes/edc/efl/spotlight.edc | 4 +- data/elementary/themes/edc/elm/progress.edc | 2 + data/elementary/themes/edc/elm/radio.edc | 53 ++++++++++++--- 9 files changed, 210 insertions(+), 150 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index bae8de6138..71ea329273 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -604,12 +604,10 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/radio/base"; color: 48 48 48 255; } - color_class { name: "/bg/pressed/radio/base"; - color: 32 32 32 255; } color_class { name: "/bg/disabled/radio/base"; color: 56 56 56 255; } -// color_class { name: "/fg/selected/radio/radio"; -// color: 160 160 160 255; } + color_class { name: "/fg/selected/radio/radio"; + color: 160 160 160 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/toggle/base"; color: 48 48 48 255; } diff --git a/data/elementary/themes/edc/efl/pointer.edc b/data/elementary/themes/edc/efl/pointer.edc index 4a9100139d..048fe28778 100644 --- a/data/elementary/themes/edc/efl/pointer.edc +++ b/data/elementary/themes/edc/efl/pointer.edc @@ -14,10 +14,11 @@ group { name: "efl/pointer"; * will be WITHIN the bounds the axes * of thre part describe */ image.normal: "pointer.png"; + color_class: "/fg/normal/pointer/base"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color_class: "/fg/pressed/pointer/base"; } } part { name: "efl.hotspot"; type: SWALLOW; @@ -64,7 +65,7 @@ group { name: "efl/pointer:bottom_right_corner"; part { name: "box"; type: RECT; insert_after: "base"; description { state: "default" 0.0; - color: 51 153 255 192; + color_class: "/fg/normal/pointer/manipulator"; rel1.relative: 0.3 0.3; rel2.relative: 0.7 0.7; } diff --git a/data/elementary/themes/edc/efl/popup.edc b/data/elementary/themes/edc/efl/popup.edc index 67641cf5ba..06eb161797 100644 --- a/data/elementary/themes/edc/efl/popup.edc +++ b/data/elementary/themes/edc/efl/popup.edc @@ -71,19 +71,20 @@ Group: efl/alert_popup/left_button (@since 1.23) */ group { "efl/popup"; data.item: "version" "123"; + images.image: "win_shad_flat.png" COMP; parts { - image { "shadow"; - scale; - desc { "default"; - rel.to: "base"; - WIN_SHADOW; + part { name: "shadow"; type: RECT; + description { state: "default" 0.0; + rel.to: "_sh1"; + color_class: "/shadow/normal/frame"; } } + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); rect { "base"; scale; desc { "default"; min: 100 100; - color: 0 0 0 192; + color_class: "/dim/normal/popup"; rel1.offset: 16 16; rel2.offset: -17 -17; offscale; @@ -108,19 +109,20 @@ group { "efl/popup"; group { "efl/alert_popup"; data.item: "version" "123"; + images.image: "win_shad_flat.png" COMP; parts { - image { "shadow"; - scale; - desc { "default"; - rel.to: "base"; - WIN_SHADOW; + part { name: "shadow"; type: RECT; + description { state: "default" 0.0; + rel.to: "_sh1"; + color_class: "/shadow/normal/frame"; } } + WIN_SHAD("base", "shadow", "win_shad_flat.png", 10, 10, 7, 14, 0.25); rect { "base"; scale; desc { "default"; min: 100 100; - color: 0 0 0 192; + color_class: "/dim/normal/popup"; rel1.offset: 16 16; rel2.offset: -17 -17; offscale; @@ -153,7 +155,7 @@ group { "efl/alert_popup"; rel.to: "base"; rel2.relative: 1.0 0.0; align: 0.0 0.0; - color: 32 32 32 255; + color_class: "/bg/normal/popup"; } desc { "title_visible"; inherit: "default"; @@ -222,7 +224,7 @@ group { "efl/popup/backwall"; parts { rect { "base"; desc { "default"; - color: 0 0 0 64; + color_class: "/dim/normal/hover"; } desc { "content_visible"; inherit: "default"; @@ -246,7 +248,7 @@ group { "efl/popup/backwall"; rect { "block"; desc { "default"; rel.to: "base"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } diff --git a/data/elementary/themes/edc/efl/progress.edc b/data/elementary/themes/edc/efl/progress.edc index d75ef25f2d..0b86126ad4 100644 --- a/data/elementary/themes/edc/efl/progress.edc +++ b/data/elementary/themes/edc/efl/progress.edc @@ -44,7 +44,7 @@ group { name: "efl/progressbar/horizontal"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } part { name: "pulse_clip"; type: RECT; @@ -100,7 +100,7 @@ group { name: "efl/progressbar/horizontal"; rel2.to_x: "efl.content"; rel2.relative: 1.0 1.0; rel2.offset: -1 -5; - color: 160 160 160 255; + color_class: "/fg/normal/progress/text"; text { font: FN; size: 10; text_class: "progressbar"; min: 0 0; @@ -121,7 +121,7 @@ group { name: "efl/progressbar/horizontal"; } description { state: "disabled_visible" 0.0; inherit: "visible" 0.0; - color: 80 80 80 255; + color_class: "/fg/disabled/progress/text"; } } part { name: "bg"; type: RECT; @@ -131,7 +131,7 @@ group { name: "efl/progressbar/horizontal"; max: -1 16; rel1.offset: 4 4; rel2.offset: -5 -5; - color: DARK_GREY_BG_COLOR; + color_class: "/bg/normal/progress/base"; offscale; } description { state: "iclabel" 0.0; @@ -176,7 +176,7 @@ group { name: "efl/progressbar/horizontal"; rel1.to: "bg"; rel2.to_x: "barend"; rel2.to_y: "bg"; - color: 51 153 255 255; + color_class: "/fg/normal/progress/bar"; offscale; } description { state: "inv" 0.0; @@ -194,7 +194,7 @@ group { name: "efl/progressbar/horizontal"; max: 16 9999; rel.to: "efl.bar"; align: 0.0 0.5; - color: 51 153 255 255; + color_class: "/fg/normal/progress/pulse"; } description { state: "end" 0.0; inherit: "default" 0.0; @@ -214,7 +214,7 @@ group { name: "efl/progressbar/horizontal"; text_class: "progress_status"; align: 1.0 0.5; } - color: 255 255 255 255; + color_class: "/fg/normal/progress/text/status"; offscale; } description { state: "hidden" 0.0; @@ -389,12 +389,11 @@ group { name: "efl/progressbar/vertical"; parts { part { name: "dis_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "efl.content"; - rel2.to: "efl.content"; + rel.to: "efl.content"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } part { name: "pulse_clip"; type: RECT; @@ -450,7 +449,7 @@ group { name: "efl/progressbar/vertical"; rel2.to_y: "efl.content"; rel2.relative: 1.0 1.0; rel2.offset: -5 -1; - color: 160 160 160 255; + color_class: "/fg/normal/progress/text"; text { font: FN; size: 10; text_class: "progressbar"; min: 0 0; @@ -470,7 +469,7 @@ group { name: "efl/progressbar/vertical"; } description { state: "disabled_visible" 0.0; inherit: "visible" 0.0; - color: 80 80 80 255; + color_class: "/fg/disabled/progress/text"; } } part { name: "bg"; type: RECT; @@ -480,7 +479,7 @@ group { name: "efl/progressbar/vertical"; max: 16 -1; rel1.offset: 4 4; rel2.offset: -5 -5; - color: DARK_GREY_BG_COLOR; + color_class: "/bg/normal/progress/base"; offscale; } description { state: "iclabel" 0.0; @@ -491,8 +490,7 @@ group { name: "efl/progressbar/vertical"; } part { name: "efl.bar"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER; @@ -503,8 +501,7 @@ group { name: "efl/progressbar/vertical"; fixed: 1 1; min: 1 1; max: 9999 1; - rel1.to: "efl.bar"; - rel2.to: "efl.bar"; + rel.to: "efl.bar"; } } part { name: "barend"; type: SPACER; @@ -527,7 +524,7 @@ group { name: "efl/progressbar/vertical"; rel1.to: "bg"; rel2.to_y: "barend"; rel2.to_x: "bg"; - color: 51 153 255 255; + color_class: "/fg/normal/progress/bar"; offscale; } description { state: "inv" 0.0; @@ -543,10 +540,9 @@ group { name: "efl/progressbar/vertical"; fixed: 1 1; min: 8 16; max: 9999 16; - rel1.to: "efl.bar"; - rel2.to: "efl.bar"; + rel.to: "efl.bar"; align: 0.5 0.0; - color: 51 153 255 255; + color_class: "/fg/normal/progress/pulse"; } description { state: "end" 0.0; inherit: "default" 0.0; @@ -557,8 +553,7 @@ group { name: "efl/progressbar/vertical"; scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; aspect: 1.0 1.0; aspect_preference: NONE; } } @@ -566,8 +561,7 @@ group { name: "efl/progressbar/vertical"; scale: 1; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "statbox"; - rel2.to: "statbox"; + rel.to: "statbox"; rel1.offset: 4 0; rel2.offset: -5 -1; align: 1.0 0.5; @@ -580,6 +574,8 @@ group { name: "efl/progressbar/vertical"; map.smooth: 0; map.rotation.center: "efl.bar"; map.rotation.z: 90; + color_class: "/fg/normal/progress/text/status"; + offscale; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -748,13 +744,12 @@ group { name: "efl/progressbar/horizontal:bare"; description { state: "default" 0.0; min: 10 5; max: -1 5; - color: DARK_GREY_BG_COLOR; + color_class: "/bg/normal/progress/base"; } } part { name: "efl.bar"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER; @@ -765,8 +760,7 @@ group { name: "efl/progressbar/horizontal:bare"; fixed: 1 1; min: 1 1; max: 1 9999; - rel1.to: "efl.bar"; - rel2.to: "efl.bar"; + rel.to: "efl.bar"; } } part { name: "barend"; type: SPACER; @@ -788,7 +782,7 @@ group { name: "efl/progressbar/horizontal:bare"; rel1.to: "bg"; rel2.to_x: "barend"; rel2.to_y: "bg"; - color: 51 153 255 255; + color_class: "/fg/normal/progress/bar"; } description { state: "inv" 0.0; inherit: "default" 0.0; @@ -803,10 +797,9 @@ group { name: "efl/progressbar/horizontal:bare"; fixed: 1 1; min: 5 5; max: 5 9999; - rel1.to: "efl.bar"; - rel2.to: "efl.bar"; + rel.to: "efl.bar"; align: 0.0 0.5; - color: 51 153 255 255; + color_class: "/fg/normal/progress/pulse"; } description { state: "end" 0.0; inherit: "default" 0.0; @@ -871,7 +864,7 @@ group { name: "efl/progressbar/horizontal:hidden_bare"; parts { part { name: "bg"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -914,13 +907,12 @@ group { name: "efl/progressbar/vertical:bare"; description { state: "default" 0.0; min: 5 10; max: 5 -1; - color: DARK_GREY_BG_COLOR; + color_class: "/bg/normal/progress/base"; } } part { name: "efl.bar"; type: SWALLOW; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "efl.cur.progressbar"; mouse_events: 0; type: SPACER; @@ -931,8 +923,7 @@ group { name: "efl/progressbar/vertical:bare"; fixed: 1 1; min: 1 1; max: 9999 1; - rel1.to: "efl.bar"; - rel2.to: "efl.bar"; + rel.to: "efl.bar"; } } part { name: "barend"; type: SPACER; @@ -955,7 +946,7 @@ group { name: "efl/progressbar/vertical:bare"; rel1.to: "bg"; rel2.to_y: "barend"; rel2.to_x: "bg"; - color: 51 153 255 255; + color_class: "/fg/normal/progress/bar"; offscale; } description { state: "inv" 0.0; @@ -974,7 +965,7 @@ group { name: "efl/progressbar/vertical:bare"; rel1.to: "efl.bar"; rel2.to: "efl.bar"; align: 0.5 0.0; - color: 51 153 255 255; + color_class: "/fg/normal/progress/pulse"; } description { state: "end" 0.0; inherit: "default" 0.0; @@ -1039,7 +1030,7 @@ group { name: "efl/progressbar/vertical:hidden_bare"; parts { part { name: "bg"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -1072,7 +1063,7 @@ group { name: "efl/progressbar/horizontal:hidden_wheel"; part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.offset: 4 4; rel2.offset: -5 -5; min: 40 40; @@ -1094,11 +1085,11 @@ group { name: "efl/progressbar/horizontal:wheel"; description { state: "default" 0.0; image.normal: "speaker_vol.png"; rel.to:"base"; - color: 48 48 48 255; + color_class: "/bg/normal/progress/base/wheel"; } description { state: "hidden" 0.0; inherit; - color: 48 48 48 0; + color: 255 255 255 0; // no cc visible: 0; } } @@ -1146,7 +1137,7 @@ group { name: "efl/progressbar/horizontal:bar"; scale: 1; description { state: "default" 0.0; image.normal: "spinner"; - color: 160 160 160 255; + color_class: "/fg/normal/progress/spin"; rel1.relative: 0.0 0.0; rel2.relative: 0.2 1.0; rel1.to: "base"; @@ -1166,7 +1157,7 @@ group { name: "efl/progressbar/horizontal:bar"; scale: 1; description { state: "default" 0.0; image.normal: "spinner"; - color: 160 160 160 255; + color_class: "/fg/normal/progress/spin"; rel1.relative: 0.2 0.0; rel2.relative: 0.4 1.0; rel1.to: "base"; @@ -1186,7 +1177,7 @@ group { name: "efl/progressbar/horizontal:bar"; scale: 1; description { state: "default" 0.0; image.normal: "spinner"; - color: 160 160 160 255; + color_class: "/fg/normal/progress/spin"; rel1.relative: 0.4 0.0; rel2.relative: 0.6 1.0; rel1.to: "base"; @@ -1206,7 +1197,7 @@ group { name: "efl/progressbar/horizontal:bar"; scale: 1; description { state: "default" 0.0; image.normal: "spinner"; - color: 160 160 160 255; + color_class: "/fg/normal/progress/spin"; rel1.relative: 0.6 0.0; rel2.relative: 0.8 1.0; rel1.to: "base"; @@ -1226,7 +1217,7 @@ group { name: "efl/progressbar/horizontal:bar"; scale: 1; description { state: "default" 0.0; image.normal: "spinner"; - color: 160 160 160 255; + color_class: "/fg/normal/progress/spin"; rel1.relative: 0.8 0.0; rel2.relative: 1.0 1.0; rel1.to: "base"; @@ -1245,7 +1236,7 @@ group { name: "efl/progressbar/horizontal:bar"; part { name: "base"; type: RECT; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.offset: 4 4; rel2.offset: -5 -5; min: 100 20; @@ -1470,7 +1461,7 @@ group { name: "efl/progressbar/horizontal:double"; rel1.to: "bg"; rel2.to_x: "barend1"; rel2.to_y: "bg"; - color: 80 80 80 255; + color_class: "/fg/normal/progress/bar1"; offscale; } description { state: "inv" 0.0; @@ -1540,7 +1531,7 @@ group { name: "efl/progressbar/vertical:double"; rel1.to: "bg"; rel2.to_y: "barend1"; rel2.to_x: "bg"; - color: 80 80 80 255; + color_class: "/fg/normal/progress/bar1"; offscale; } description { state: "inv" 0.0; diff --git a/data/elementary/themes/edc/efl/radio.edc b/data/elementary/themes/edc/efl/radio.edc index f0549bf4d1..fdcb2f95a4 100644 --- a/data/elementary/themes/edc/efl/radio.edc +++ b/data/elementary/themes/edc/efl/radio.edc @@ -48,13 +48,13 @@ group { name: "efl/radio"; } rect { "icon_clip"; desc { "default"; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "pressed"; inherit; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } desc { "disabled"; inherit; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } swallow { "efl.content"; nomouse; @@ -108,7 +108,7 @@ group { name: "efl/radio"; desc { "disabled"; inherit; } } - part { name: "ck_check"; + part { name: "ck_bg"; scale: 1; description { state: "default" 0.0; fixed: 1 1; @@ -116,18 +116,45 @@ group { name: "efl/radio"; image.normal: "i-radio"; min: 15 15; max: 15 15; - color: 0 0 0 64; + color_class: "/bg/normal/radio/base"; } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; + desc { "disabled"; inherit; + color_class: "/bg/disabled/radio/base"; + } + } + part { name: "ck_check"; + scale: 1; + description { state: "default" 0.0; + color_class: "/fg/selected/radio/radio"; + fixed: 1 1; + rel.to: "base"; + image.normal: "i-radio"; + min: 15 15; + max: 15 15; + visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 160 160 160 255; + visible: 1; } desc { "disabled"; inherit; - color: 0 0 0 16; + visible: 0; + } + } + part { name: "ck_press"; + scale: 1; + description { state: "default" 0.0; + color_class: "/fg/pressed/radio/radio"; + fixed: 1 1; + rel.to: "base"; + image.normal: "i-radio"; + min: 15 15; + max: 15 15; + visible: 0; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; } } text { "efl.text"; nomouse; @@ -135,7 +162,7 @@ group { name: "efl/radio"; scale: 1; desc { "default"; fixed: 0 1; - color: 160 160 160 255; + color_class: "/fg/normal/radio/text"; rel1.offset: 0 4; rel1.relative: 1.0 0.0; rel1.to_x: "efl.content"; @@ -157,7 +184,7 @@ group { name: "efl/radio"; } desc { "pressed_visible"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/radio/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -171,14 +198,14 @@ group { name: "efl/radio"; } desc { "pressed_textonly"; inherit; fixed: 0 0; - color: 255 255 255 255; + color_class: "/fg/pressed/radio/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; } desc { "disabled_visible"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/radio/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -186,7 +213,7 @@ group { name: "efl/radio"; } desc { "disabled_textonly"; inherit; fixed: 0 0; - color: 96 96 96 255; + color_class: "/fg/disabled/radio/text"; text.min: 1 1; text.ellipsis: -1; visible: 1; @@ -195,7 +222,7 @@ group { name: "efl/radio"; rect { "event"; ignore_flags: ON_HOLD; desc { "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } desc { "disabled"; inherit; visible: 0; @@ -239,10 +266,20 @@ group { name: "efl/radio"; program { signal: "efl,state,disabled"; source: "efl"; action: STATE_SET "disabled" 0.0; target: "ck_check"; + target: "ck_bg"; } program { signal: "efl,state,enabled"; source: "efl"; action: STATE_SET "default" 0.0; target: "ck_check"; + target: "ck_bg"; + } + program { signal: "mouse,down,1"; source: "event"; + action: STATE_SET "pressed" 0.0; + target: "ck_press"; + } + program { signal: "mouse,up,1"; source: "event"; + action: STATE_SET "default" 0.0; + target: "ck_press"; } } } diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc index 897bde6213..339266826a 100644 --- a/data/elementary/themes/edc/efl/scroller.edc +++ b/data/elementary/themes/edc/efl/scroller.edc @@ -52,7 +52,7 @@ group { name: "efl/scroller"; part { name: "bg"; type: RECT; description { state: "default" 0.0; rel.to: "efl.background"; - color: 0 0 0 0; + color_class: "/bg/normal/scroller/base"; } } part { name: "clipper"; type: RECT; @@ -82,7 +82,8 @@ group { name: "efl/scroller"; scale: 1; clip_to: "sh_clip"; description { state: "default" 0.0; - color: 255 255 255 0; + color_class: "/shadow/normal/scroller"; + color: 255 255 255 0; // no cc rel.to: "efl.content"; rel1.offset: 0 -1; rel2.offset: -1 -1; @@ -93,7 +94,7 @@ group { name: "efl/scroller"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 255; // no cc rel1.offset: 0 -16; rel2.offset: -1 15; visible: 1; @@ -114,7 +115,8 @@ group { name: "efl/scroller"; scale: 1; clip_to: "sh_clip"; description { state: "default" 0.0; - color: 255 255 255 0; + color_class: "/shadow/normal/scroller"; + color: 255 255 255 0; // no cc rel.to: "efl.content"; rel1.relative: 0.0 1.0; rel1.offset: 0 0; @@ -125,7 +127,7 @@ group { name: "efl/scroller"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 255; // no cc rel1.offset: 0 -16; rel2.offset: -1 15; visible: 1; @@ -146,7 +148,8 @@ group { name: "efl/scroller"; scale: 1; clip_to: "sh_clip"; description { state: "default" 0.0; - color: 255 255 255 0; + color_class: "/shadow/normal/scroller"; + color: 255 255 255 0; // no cc rel.to: "efl.content"; rel1.offset: -1 0; rel2.offset: -1 -1; @@ -157,7 +160,7 @@ group { name: "efl/scroller"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 255; // no cc rel1.offset: -16 0; rel2.offset: 15 -1; visible: 1; @@ -178,7 +181,8 @@ group { name: "efl/scroller"; scale: 1; clip_to: "sh_clip"; description { state: "default" 0.0; - color: 255 255 255 0; + color_class: "/shadow/normal/scroller"; + color: 255 255 255 0; // no cc rel.to: "efl.content"; rel1.relative: 1.0 0.0; rel1.offset: 0 0; @@ -189,7 +193,7 @@ group { name: "efl/scroller"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 255; // no cc rel1.offset: -16 0; rel2.offset: 15 -1; visible: 1; @@ -242,7 +246,7 @@ group { name: "efl/scroller"; part { name: "sb_vbar_p1"; type: RECT; clip_to: "sb_vbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.to: "sb_vbar"; rel2.relative: 1.0 0.0; rel2.to: "efl.draggable.vertical_bar"; @@ -252,7 +256,7 @@ group { name: "efl/scroller"; part { name: "sb_vbar_p2"; type: RECT; clip_to: "sb_vbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.relative: 0.0 1.0; rel1.to: "efl.draggable.vertical_bar"; rel2.to: "sb_vbar"; @@ -269,10 +273,9 @@ group { name: "efl/scroller"; fixed: 1 1; min: 15 15; rel1.relative: 0.5 0.5; - rel1.to: "sb_vbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_vbar"; - color: 0 0 0 0; + rel.to: "sb_vbar"; + color: 0 0 0 0; // no cc } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -286,10 +289,9 @@ group { name: "efl/scroller"; repeat_events: 1; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "sb_vbar"; + color: 0 0 0 0; // no cc rel1.offset: -45 0; - rel2.to: "sb_vbar"; + rel.to: "sb_vbar"; fixed: 1 1; offscale; } @@ -312,8 +314,7 @@ group { name: "efl/scroller"; max: 4 2; fixed: 1 1; align: 0.0 0.0; - rel1.to: "sb_vbar"; - rel2.to: "sb_vbar"; + rel.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -329,8 +330,7 @@ group { name: "efl/scroller"; max: 4 2; fixed: 1 1; align: 0.0 0.0; - rel1.to: "efl.draggable.vertical_bar"; - rel2.to: "efl.draggable.vertical_bar"; + rel.to: "efl.draggable.vertical_bar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -346,8 +346,7 @@ group { name: "efl/scroller"; max: 4 2; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_vbar"; - rel2.to: "sb_vbar"; + rel.to: "sb_vbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -363,8 +362,7 @@ group { name: "efl/scroller"; max: 4 2; fixed: 1 1; align: 0.0 1.0; - rel1.to: "efl.draggable.vertical_bar"; - rel2.to: "efl.draggable.vertical_bar"; + rel.to: "efl.draggable.vertical_bar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -444,7 +442,7 @@ group { name: "efl/scroller"; part { name: "sb_hbar_p1"; type: RECT; clip_to: "sb_hbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.to: "sb_hbar"; rel2.relative: 0.0 1.0; rel2.to: "efl.draggable.horizontal_bar"; @@ -454,7 +452,7 @@ group { name: "efl/scroller"; part { name: "sb_hbar_p2"; type: RECT; clip_to: "sb_hbar"; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.relative: 1.0 0.0; rel1.to: "efl.draggable.horizontal_bar"; rel2.to: "sb_hbar"; @@ -471,10 +469,9 @@ group { name: "efl/scroller"; fixed: 1 1; min: 15 15; rel1.relative: 0.5 0.5; - rel1.to: "sb_hbar"; rel2.relative: 0.5 0.5; - rel2.to: "sb_hbar"; - color: 0 0 0 0; + rel.to: "sb_hbar"; + color: 0 0 0 0; // no cc } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -488,10 +485,9 @@ group { name: "efl/scroller"; repeat_events: 1; scale: 1; description { state: "default" 0.0; - color: 0 0 0 0; - rel1.to: "sb_hbar"; + color: 0 0 0 0; // no cc rel1.offset: 0 -45; - rel2.to: "sb_hbar"; + rel.to: "sb_hbar"; fixed: 1 1; offscale; } @@ -514,8 +510,7 @@ group { name: "efl/scroller"; max: 2 4; fixed: 1 1; align: 0.0 1.0; - rel1.to: "sb_hbar"; - rel2.to: "sb_hbar"; + rel.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -531,8 +526,7 @@ group { name: "efl/scroller"; max: 2 4; fixed: 1 1; align: 0.0 1.0; - rel1.to: "efl.draggable.horizontal_bar"; - rel2.to: "efl.draggable.horizontal_bar"; + rel.to: "efl.draggable.horizontal_bar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -548,8 +542,7 @@ group { name: "efl/scroller"; max: 2 4; fixed: 1 1; align: 1.0 1.0; - rel1.to: "sb_hbar"; - rel2.to: "sb_hbar"; + rel.to: "sb_hbar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -565,8 +558,7 @@ group { name: "efl/scroller"; max: 2 4; fixed: 1 1; align: 1.0 1.0; - rel1.to: "efl.draggable.horizontal_bar"; - rel2.to: "efl.draggable.horizontal_bar"; + rel.to: "efl.draggable.horizontal_bar"; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -622,15 +614,15 @@ group { name: "efl/scroller"; clip_to: "sb_vbar_show"; description { state: "default" 0.0; fixed: 1 1; - color: 51 153 255 255; + color_class: "/fg/normal/scroller/bar/vertical"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/fg/disabled/scroller/bar/vertical"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/scroller/bar/vertical"; } } @@ -656,15 +648,15 @@ group { name: "efl/scroller"; clip_to: "sb_hbar_show"; description { state: "default" 0.0; fixed: 1 1; - color: 51 153 255 255; + color_class: "/fg/normal/scroller/bar/horizontal"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 80 80 80 255; + color_class: "/fg/disabled/scroller/bar/horizontal"; } description { state: "clicked" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/pressed/scroller/bar/horizontal"; } } @@ -689,10 +681,10 @@ group { name: "efl/scroller"; part { name: "dim_effect"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 0 0 0 0; + color: 32 32 32 0; // no cc } description { state: "effect" 0.0; - color: 32 32 32 255; + color: 32 32 32 255; // no cc } } } diff --git a/data/elementary/themes/edc/efl/spotlight.edc b/data/elementary/themes/edc/efl/spotlight.edc index 2aaa694414..13c5b7c97d 100644 --- a/data/elementary/themes/edc/efl/spotlight.edc +++ b/data/elementary/themes/edc/efl/spotlight.edc @@ -37,7 +37,7 @@ group { "efl/spotlight/indicator"; scale; desc { "default"; image.normal: "i-radio"; - color: 0 0 0 255; + color: 0 0 0 255; // no cc min: 8 8; rel1.offset: 4 4; rel2.offset: -5 -5; @@ -45,7 +45,7 @@ group { "efl/spotlight/indicator"; } desc { "selected"; inherit: "default"; - color: 255 0 0 255; + color: 255 0 0 255; // no cc } } } diff --git a/data/elementary/themes/edc/elm/progress.edc b/data/elementary/themes/edc/elm/progress.edc index c086fde506..495c54e5b8 100644 --- a/data/elementary/themes/edc/elm/progress.edc +++ b/data/elementary/themes/edc/elm/progress.edc @@ -572,6 +572,8 @@ group { name: "elm/progressbar/vertical/default"; map.smooth: 0; map.rotation.center: "elm.swallow.bar"; map.rotation.z: 90; + color_class: "/fg/normal/progress/text/status"; + offscale; } description { state: "hidden" 0.0; inherit: "default" 0.0; diff --git a/data/elementary/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc index 482125e779..becfdbee99 100644 --- a/data/elementary/themes/edc/elm/radio.edc +++ b/data/elementary/themes/edc/elm/radio.edc @@ -90,26 +90,53 @@ group { name: "elm/radio/base/default"; desc { "disabled"; inherit; } } - part { name: "ck_check"; + part { name: "ck_bg"; scale: 1; description { state: "default" 0.0; + fixed: 1 1; rel.to: "base"; image.normal: "i-radio"; min: 15 15; max: 15 15; color_class: "/bg/normal/radio/base"; - fixed: 1 1; } - description { state: "pressed" 0.0; - inherit: "default" 0.0; - color_class: "/fg/pressed/radio/base"; + desc { "disabled"; inherit; + color_class: "/bg/disabled/radio/base"; + } + } + part { name: "ck_check"; + scale: 1; + description { state: "default" 0.0; + color_class: "/fg/selected/radio/radio"; + rel.to: "base"; + image.normal: "i-radio"; + min: 15 15; + max: 15 15; + fixed: 1 1; + visible: 0; } description { state: "selected" 0.0; inherit: "default" 0.0; - color_class: "/fg/selected/radio/base"; + visible: 1; } desc { "disabled"; inherit; - color_class: "/bg/disabled/radio/base"; + visible: 0; + } + } + part { name: "ck_press"; + scale: 1; + description { state: "default" 0.0; + color_class: "/fg/pressed/radio/radio"; + fixed: 1 1; + rel.to: "base"; + image.normal: "i-radio"; + min: 15 15; + max: 15 15; + visible: 0; + } + description { state: "pressed" 0.0; + inherit: "default" 0.0; + visible: 1; } } text { "elm.text"; nomouse; @@ -138,7 +165,7 @@ group { name: "elm/radio/base/default"; } desc { "pressed_visible"; inherit; fixed: 0 0; - color_class: "/fg/prssed/radio/text"; + color_class: "/fg/pressed/radio/text"; rel1.offset: 4 4; text.min: 1 1; text.ellipsis: -1; @@ -251,10 +278,20 @@ group { name: "elm/radio/base/default"; program { signal: "elm,state,disabled"; source: "elm"; action: STATE_SET "disabled" 0.0; target: "ck_check"; + target: "ck_bg"; } program { signal: "elm,state,enabled"; source: "elm"; action: STATE_SET "default" 0.0; target: "ck_check"; + target: "ck_bg"; + } + program { signal: "mouse,down,1"; source: "event"; + action: STATE_SET "pressed" 0.0; + target: "ck_press"; + } + program { signal: "mouse,up,1"; source: "event"; + action: STATE_SET "default" 0.0; + target: "ck_press"; } } } --
