From aeb78842df91c3bcd4356643b7364f9916fe5ba5 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 8 Aug 2021 17:04:19 +0100 Subject: [PATCH] elm theme - more cc work --- data/elementary/themes/edc/elm/menu.edc | 61 +++++++++++++------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/data/elementary/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc index 6a4ee992c2..05789161f4 100644 --- a/data/elementary/themes/edc/elm/menu.edc +++ b/data/elementary/themes/edc/elm/menu.edc @@ -6,7 +6,7 @@ group { name: "elm/menu/item/default"; 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; @@ -59,7 +59,7 @@ group { name: "elm/menu/item/default"; rel2.to_x: "arrowspace"; rel2.offset: -5 -5; rel2.relative: 0.0 1.0; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/text"; offscale; text { font: FN; size: 10; min: 1 1; @@ -70,17 +70,17 @@ group { name: "elm/menu/item/default"; } description { state: "active" 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"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 255 255 255 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -89,11 +89,11 @@ group { name: "elm/menu/item/default"; } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 64; // no cc } } } @@ -167,19 +167,18 @@ group { name: "elm/menu/item/default"; group { name: "elm/menu/item_with_submenu/default"; inherit: "elm/menu/item/default"; // alias: "elm/menu/main_menu_submenu/default"; - images.image: "menu_submenu.png" COMP; parts { part { name: "arrow"; description { state: "default" 0.0; min: 15 15; max: 15 15; rel.to: "arrowspace"; - image.normal: "menu_submenu.png"; - color: 160 160 160 255; + image.normal: "i-arrow-r"; + color_class: "/fg/normal/menu/item/arrow"; } description { state: "active" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color_class: "/fg/selected/menu/item/arrow"; } } } @@ -203,11 +202,13 @@ group { name: "elm/menu/item_with_submenu/default"; group { name: "elm/menu/separator/default"; parts { part { name: "separator"; type: RECT; + scale; description { state: "default" 0.0; rel1.offset: 0 10; rel2.offset: -1 -11; min: 0 1; - color: 72 72 72 255; + color_class: "/fg/normal/separator/menu"; + offscale; } } } @@ -221,7 +222,7 @@ group { name: "elm/menu/main_menu_submenu/default"; 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; @@ -273,7 +274,7 @@ group { name: "elm/menu/main_menu_submenu/default"; rel2.to_x: "arrowspace"; rel2.offset: -5 -5; rel2.relative: 0.0 1.0; - color: 160 160 160 255; + color_class: "/fg/normal/menu/item/text"; offscale; text { font: FN; size: 10; min: 1 1; @@ -284,17 +285,17 @@ group { name: "elm/menu/main_menu_submenu/default"; } description { state: "active" 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"; } } part { name: "event"; type: RECT; ignore_flags: ON_HOLD; description { state: "default" 0.0; - color: 255 255 255 0; + color: 0 0 0 0; // no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -303,11 +304,11 @@ group { name: "elm/menu/main_menu_submenu/default"; } part { name: "disabler"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255;// no cc } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 128; + color: 255 255 255 64; // no cc } } } @@ -399,7 +400,7 @@ group { name: "elm/hover/base/menu/default"; } part { name: "base"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "elm.swallow.slot.left"; type: SWALLOW; @@ -420,7 +421,7 @@ group { name: "elm/hover/base/menu/default"; part { name: "bottomclip"; type: RECT; scale; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc rel1.offset: -200 -200; rel2.offset: 199 199; offscale; @@ -428,7 +429,7 @@ group { name: "elm/hover/base/menu/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } WIN_SHAD("bg", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5) @@ -438,13 +439,14 @@ group { name: "elm/hover/base/menu/default"; rel.to: "bg"; rel1.offset: -1000 -1000; rel2.offset: 1000 1000; + color_class: "/shadow/normal/menu"; } } part { name: "bg"; type: RECT; mouse_events: 0; clip_to: "bottomclip"; description { state: "default" 0.0; rel.to: "elm.swallow.slot.bottom"; - color: 64 64 64 255; + color_class: "/bg/normal/menu/base"; } } @@ -501,7 +503,7 @@ group { name: "elm/hover/base/submenu/default"; //here we don't catch events like the hover does part { name: "base"; type: RECT; repeat_events: 1; description { state: "visible" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc visible: 0; } } @@ -533,7 +535,7 @@ group { name: "elm/hover/base/main_menu/default"; description { state: "default" 0.0; rel1.to_y: "bottom"; rel2.to_y: "bottom"; - color: 64 64 64 255; + color_class: "/bg/normal/menu/bar"; } } part { name: "bottom"; type: RECT; @@ -587,12 +589,12 @@ group { name: "elm/hover/base/main_menu_submenu/default"; } part { name: "base"; type: RECT; repeat_events: 1; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "bottomclip"; type: RECT; description { state: "default" 0.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc rel1.offset: -200 -200; rel2.offset: 199 199; offscale; @@ -600,7 +602,7 @@ group { name: "elm/hover/base/main_menu_submenu/default"; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } } WIN_SHAD("bg", "shadow", "win_shad_angle.png", 21, 21, 14, 28, 0.5) @@ -610,13 +612,14 @@ group { name: "elm/hover/base/main_menu_submenu/default"; rel.to: "bg"; rel1.offset: -1000 -1000; rel2.offset: 1000 1000; + color_class: "/shadow/normal/menu"; } } part { name: "bg"; type: RECT; mouse_events: 0; clip_to: "bottomclip"; description { state: "default" 0.0; rel.to: "elm.swallow.slot.bottom"; - color: 64 64 64 255; + color_class: "/bg/normal/menu/base"; } } part { name: "elm.swallow.slot.bottom"; type: SWALLOW;