From 10282241f83aef45d97836b97efa3b1b0bc4f541 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 27 Jun 2021 17:19:29 +0100 Subject: [PATCH] elm theme - more cc --- data/elementary/themes/colorclasses.edc | 9 ++ data/elementary/themes/edc/ibar-ibox.edc | 148 +++++++++++++---------- 2 files changed, 93 insertions(+), 64 deletions(-) diff --git a/data/elementary/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc index e212dd7194..7ec512e475 100644 --- a/data/elementary/themes/colorclasses.edc +++ b/data/elementary/themes/colorclasses.edc @@ -355,6 +355,15 @@ color_classes { /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/selected/edgebindings/edge"; color: 51 153 255 255; } +/////////////////////////////////////////////////////////////////////////////// + color_class { name: "/fg/normal/gadgets/ibar/text/text"; + color: 255 255 255 255; } + color_class { name: "/bg/normal/gadgets/ibar/drop/base"; + color: 51 153 255 25; } + color_class { name: "/bg/normal/gadgets/ibar/drop/outline"; + color: 51 153 255 255; } + color_class { name: "/fg/normal/gadgets/ibar/drop/arrow"; + color: 51 153 255 255; } /////////////////////////////////////////////////////////////////////////////// color_class { name: "/fg/normal/gadgets/backlight/light/off"; color: 255 255 255 0; } diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc index 507cce76a3..2336666fce 100644 --- a/data/elementary/themes/edc/ibar-ibox.edc +++ b/data/elementary/themes/edc/ibar-ibox.edc @@ -1,12 +1,14 @@ group { name: "e/modules/ibar/separator/default"; parts { part { name: "base"; type: RECT; + scale: 1; description { state: "default" 0.0; min: 1 1; max: 1 99999; rel1.offset: 4 4; rel2.offset: -5 -5; - color: 80 80 80 255; + color_class: "/fg/normal/gadgets/ibar/separator"; + offscale; } } } @@ -30,14 +32,16 @@ group { name: "e/modules/ibox/icon"; // data.item: "item_list" "item item2 item3"; parts { part { name: "item_clip"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.offset: -100 -100; - rel2.offset: 99 99; - color: 255 255 255 255; + rel1.offset: -1000 -1000; + rel2.offset: 999 999; + color: 255 255 255 255; // no cc + offscale; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } part { name: "content"; type: SPACER; @@ -151,7 +155,7 @@ group { name: "e/modules/ibox/icon"; scale: 1; clip_to: "clip1"; description { state: "default"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/ibar/selection"; visible: 0; rel1.relative: 0.0 1.0; align: 0.5 1.0; @@ -170,7 +174,7 @@ group { name: "e/modules/ibox/icon"; scale: 1; clip_to: "clip2"; description { state: "default"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/ibar/selection"; visible: 0; rel2.relative: 0.0 1.0; align: 0.0 0.5; @@ -189,7 +193,7 @@ group { name: "e/modules/ibox/icon"; scale: 1; clip_to: "clip3"; description { state: "default"; - color: 51 153 255 255; + color_class: "/bg/selected/gadgets/ibar/selection"; visible: 0; rel1.relative: 1.0 0.0; align: 1.0 0.5; @@ -206,7 +210,7 @@ group { name: "e/modules/ibox/icon"; } part { name: "over"; type: RECT; description { state: "default" 0.0; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } @@ -314,20 +318,24 @@ group { name: "e/modules/ibox/icon_overlay"; } parts { part { name: "item_clip"; type: RECT; + scale: 1; description { state: "default" 0.0; - rel1.offset: -100 -100; - rel2.offset: 99 99; - color: 255 255 255 255; + rel1.offset: -1000 -1000; + rel2.offset: 999 999; + color: 255 255 255 255; // no cc + offscale; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; + color: 255 255 255 64; // no cc } } part { name: "base"; type: SPACER; + scale: 1; description { state: "default" 0.0; rel1.offset: 3 4; rel2.offset: -4 -4; + offscale; } description { state: "bounce1" 0.0; inherit: "default" 0.0; @@ -345,12 +353,12 @@ group { name: "e/modules/ibox/icon_overlay"; description { state: "default" 0.0; visible: 0; rel.to: "base"; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 255; // no cc } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -363,7 +371,7 @@ group { name: "e/modules/ibox/icon_overlay"; visible: 1; rel1.relative: -2.0 -2.0; rel2.relative: 3.0 3.0; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "content"; type: SPACER; @@ -395,9 +403,9 @@ group { name: "e/modules/ibox/icon_overlay"; rel.to: "background"; } } - text { name: "spacer"; scale: 1; + text { name: "spacer"; scale: 1; desc { - color: 0 0 0 0; + color: 0 0 0 0; // no cc rel1.relative: 1 0; rel2.relative: 0 1; text { @@ -419,17 +427,20 @@ group { name: "e/modules/ibox/icon_overlay"; } } part { name: "bg"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; rel1.offset: -5 -5; rel.to: "e.text.label"; rel2.offset: 4 4; fixed: 1 1; - color: 0 0 0 0; + color_class: "/dim/normal/gadgets/ibar/text/base"; + color: 255 255 255 0; // no cc visible: 0; + offscale; } description { state: "visible" 0.0; inherit: "default" 0.0; - color: 0 0 0 192; + color: 255 255 255 255; // no cc visible: 1; } } @@ -446,14 +457,15 @@ group { name: "e/modules/ibox/icon_overlay"; align: 0.5 0.5; text_class: "module_normal"; } - color: 255 255 255 0; + color_class: "/fg/normal/gadgets/ibar/text/text"; + color: 255 255 255 0; // no cc visible: 0; } description { state: "visible" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 0.5; rel2.relative: 1.0 0.5; - color: 255 255 255 255; + color: 255 255 255 255; // no cc visible: 1; } } @@ -541,8 +553,7 @@ group { name: "e/modules/ibox/icon_overlay"; } } } - program { - signal: "e,state,urgent"; source: "e"; + program { signal: "e,state,urgent"; source: "e"; script { set_int(urgent, 1); } @@ -594,6 +605,17 @@ group { name: "e/modules/ibox/drop"; images.image: "outline.png" COMP; images.image: "diagonal_stripes.png" COMP; parts { + part { name: "pat"; mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "base"; + rel1.offset: 1 1; + rel2.offset: -2 -2; + rel2.to: "base"; + image.normal: "diagonal_stripes.png"; + color_class: "/bg/normal/gadgets/ibar/drop/base"; + TILED_PATTERN(240, 240) + } + } part { name: "base"; mouse_events: 0; description { state: "default" 0.0; rel1.offset: 2 2; @@ -602,18 +624,7 @@ group { name: "e/modules/ibox/drop"; image.border: 4 4 4 4; image.middle: 0; fill.smooth: 0; - color: 51 153 255 255; - } - } - part { name: "pat"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel1.offset: 1 1; - rel2.offset: -2 -2; - rel2.to: "base"; - image.normal: "diagonal_stripes.png"; - color: 51 153 255 25; - TILED_PATTERN(240, 240) + color_class: "/bg/normal/gadgets/ibar/drop/outline"; } } } @@ -627,6 +638,7 @@ group { name: "e/modules/ibox/drop_overlay"; images.image: "mini_blue_glow_arrow_3.png" COMP; parts { part { name: "drop0"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_0.png"; rel1.offset: -10 -10; @@ -637,6 +649,8 @@ group { name: "e/modules/ibox/drop_overlay"; min: 10 10; fixed: 1 1; visible: 0; + offscale; + color_class: "/fg/normal/gadgets/ibar/drop/arrow"; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -647,10 +661,11 @@ group { name: "e/modules/ibox/drop_overlay"; rel1.offset: 11 11; rel2.offset: 11 11; min: 1 1; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "drop1"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_1.png"; rel1.offset: 9 -10; @@ -661,6 +676,8 @@ group { name: "e/modules/ibox/drop_overlay"; min: 10 10; fixed: 1 1; visible: 0; + offscale; + color_class: "/fg/normal/gadgets/ibar/drop/arrow"; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -671,10 +688,11 @@ group { name: "e/modules/ibox/drop_overlay"; rel1.offset: -12 11; rel2.offset: -12 11; min: 1 1; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "drop2"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_2.png"; rel1.offset: 9 9; @@ -685,6 +703,8 @@ group { name: "e/modules/ibox/drop_overlay"; min: 10 10; fixed: 1 1; visible: 0; + offscale; + color_class: "/fg/normal/gadgets/ibar/drop/arrow"; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -695,10 +715,11 @@ group { name: "e/modules/ibox/drop_overlay"; rel1.offset: -12 -12; rel2.offset: -12 -12; min: 1 1; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } part { name: "drop3"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; image.normal: "mini_blue_glow_arrow_3.png"; rel1.offset: -10 9; @@ -709,6 +730,8 @@ group { name: "e/modules/ibox/drop_overlay"; min: 10 10; fixed: 1 1; visible: 0; + offscale; + color_class: "/fg/normal/gadgets/ibar/drop/arrow"; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -719,7 +742,7 @@ group { name: "e/modules/ibox/drop_overlay"; rel1.offset: 11 -12; rel2.offset: 11 -12; min: 1 1; - color: 255 255 255 0; + color: 255 255 255 0; // no cc } } } @@ -748,16 +771,17 @@ group { name: "e/modules/ibox/drop_overlay"; group { name: "e/modules/ibar/menu"; parts { part { name: "clip"; type: RECT; - description { state: "default"; } + description { state: "default"; + } description { state: "hidden"; inherit: "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } part { name: "base"; type: RECT; mouse_events: 0; clip_to: "clip"; description { state: "default" 0.0; - color: 0 0 0 192; + color_class: "/dim/normal/gadgets/ibar/menu/base"; } } part { name: "e.box"; type: BOX; @@ -806,13 +830,15 @@ group { name: "e/modules/ibar/menu"; group { name: "e/modules/ibar/menu/item"; parts { part { name: "base"; type: RECT; + scale: 1; description { state: "default"; rel1.offset: -5 0; rel2.offset: 4 -1; - color: 64 64 64 255; + color_class: "/bg/selected/gadgets/ibar/menu/item/base"; visible: 0; link.base: "e,state,unfocused" "e"; link.transition: ACCEL 0.1; + offscale; } description { state: "focused"; inherit: "default" 0.0; @@ -842,13 +868,14 @@ group { name: "e/modules/ibar/menu/item"; } */ part { name: "icon"; scale: 1; type: SPACER; + scale: 1; description { state: "default"; rel1.offset: 2 2; rel2.offset: 2 -3; align: 0.0 0.5; - aspect: 1.0 1.0; aspect_preference: BOTH; - min: 48 48; - max: 48 48; + min: 40 40; + max: 40 40; + offscale; } } part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0; @@ -861,39 +888,32 @@ group { name: "e/modules/ibar/menu/item"; description { state: "default" 0.0; rel1.to_x: "icon"; rel1.relative: 1.0 0.0; - rel1.offset: 3 0; + rel1.offset: 3 3; rel2.offset: -3 -3; align: 0.0 0.0; - min: 128 0; - color: 160 160 160 255; + min: 160 0; + color_class: "/fg/normal/gadgets/ibar/menu/item/base"; + offscale; text { font: FNBD; size: 10; text: "window name thingy"; min: 0 1; align: 0.0 0.5; text_class: "menu_item"; } + link.base: "e,state,unfocused" "e"; + link.transition: ACCEL 0.1; } description { state: "focus"; inherit: "default"; - color: 255 255 255 255; + color_class: "/fg/selected/gadgets/ibar/menu/item/base"; + link.base: "e,state,focused" "e"; + link.transition: ACCEL 0.1; } } part { name: "event"; type: RECT; description { state: "default"; - color: 0 0 0 0; + color: 0 0 0 0; // no cc } } } - programs { - program { signal: "mouse,in"; source: "event"; - action: STATE_SET "focus" 0.0; - target: "e.text.title"; - transition: ACCELERATE 0.2; - } - program { signal: "mouse,out"; source: "event"; - action: STATE_SET "default" 0.0; - target: "e.text.title"; - transition: DECELERATE 0.2; - } - } }