From e1a117e0d4975772139c2574c859b2168903ad36 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 27 Jun 2021 19:08:13 +0100 Subject: [PATCH] elm theme - more cc work --- data/elementary/themes/colorclasses.edc | 9 ++++++ data/elementary/themes/edc/menu.edc | 40 +++++++++++++------------ 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index a2103a7a71..63f51f98af 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -45,6 +45,15 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/dim"; color: 0 0 0 200; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/menu/title"; + color: 255 255 255 255; } + color_class { name: "/bg/selected/menu/item/base"; + color: 32 32 32 255; } + color_class { name: "/bg/normal/menu/item/check/base"; + color: 48 48 48 255; } + color_class { name: "/bg/normal/menu/item/radio/base"; + color: 48 48 48 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/bg/normal/access"; color: 255 153 51 64; } diff --git a/data/elementary/themes/edc/menu.edc b/data/elementary/themes/edc/menu.edc index ed4613770c..2bb0e578f6 100644 --- a/data/elementary/themes/edc/menu.edc +++ b/data/elementary/themes/edc/menu.edc @@ -2,7 +2,7 @@ group { name: "e/widgets/menu/default/background"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 64 64 64 255; + color_class: "/bg/normal/menu/base"; } } part { name: "clip"; type: RECT; mouse_events: 0; @@ -18,7 +18,7 @@ group { name: "e/widgets/menu/default/background"; rel2.relative: 1.0 0.0; rel2.offset: -2 -1; align: 0.5 0.0; - color: 255 255 255 255; + color_class: "/fg/normal/menu/title"; max: 0 0; text { font: FNBD; size: 10; text_class: "menu_title"; @@ -40,8 +40,10 @@ group { name: "e/widgets/menu/default/background"; } part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip"; + scale: 1; description { state: "default" 0.0; rel1.to_y: "base"; + offscale; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -73,7 +75,7 @@ group { name: "e/widgets/menu/default/separator"; rel1.offset: 0 10; rel2.offset: -1 -11; min: 0 1; - color: 72 72 72 255; + color_class: "/fg/normal/separator/menu"; offscale; } } @@ -85,7 +87,7 @@ group { name: "e/widgets/menu/default/item_bg"; parts { part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 40 40 40 255; + color_class: "/bg/selected/menu/item/base"; visible: 0; } description { state: "active" 0.0; @@ -105,7 +107,7 @@ group { name: "e/widgets/menu/default/item_bg"; } part { name: "events"; type: RECT; description { state: "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -125,10 +127,10 @@ group { name: "e/widgets/menu/default/icon"; parts { part { name: "clip"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } description { state: "disabled" 0.0; - color: 255 255 255 40; + color: 255 255 255 64; // no cc } } part { name: "e.swallow.content"; type: SWALLOW; @@ -158,7 +160,7 @@ group { name: "e/widgets/menu/default/label"; parts { part { name: "base"; type: RECT; description { state: "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "e.text.label"; type: TEXT; mouse_events: 0; @@ -166,7 +168,7 @@ group { name: "e/widgets/menu/default/label"; description { state: "default" 0.0; rel1.offset: 4 -1; rel2.offset: -5 -1; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/text"; min: 0 16; text { font: FN; size: 10; min: 1 1; @@ -178,11 +180,11 @@ group { name: "e/widgets/menu/default/label"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item/text"; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 96 96 96 255; + color_class: "/fg/disabled/menu/item/text"; } } } @@ -216,12 +218,12 @@ group { name: "e/widgets/menu/default/submenu"; rel2.offset: -5 -1; min: 15 15; max: 15 15; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/arrow"; offscale; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item/arrow"; } } } @@ -242,7 +244,7 @@ group { name: "e/widgets/menu/default/check"; part { name: "bg"; type: RECT; scale: 1; description { state: "default"; - color: 0 0 0 64; + color_class: "/bg/normal/menu/item/check/base"; aspect: 1.0 1.0; aspect_preference: BOTH; rel1.offset: 4 0; rel2.offset: -5 -1; @@ -269,11 +271,11 @@ group { name: "e/widgets/menu/default/check"; part { name: "selected"; type: RECT; description { state: "default" 0.0; rel.to: "base"; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/check/check"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item/check/check"; } } } @@ -303,7 +305,7 @@ group { name: "e/widgets/menu/default/radio"; description { state: "default" 0.0; image.normal: "i-radio"; rel.to: "base"; - color: 0 0 0 64; + color_class: "/bg/normal/menu/item/radio/base"; visible: 1; } description { state: "on" 0.0; @@ -331,11 +333,11 @@ group { name: "e/widgets/menu/default/radio"; part { name: "selected"; type: RECT; description { state: "default" 0.0; rel.to: "base"; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/radio/radio"; } description { state: "selected" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item/radio/radio"; } } }