raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=029f207a9e34de55d6ba81187424cfd8bd699c2d
commit 029f207a9e34de55d6ba81187424cfd8bd699c2d Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Sat Jan 4 19:49:24 2020 +0000 TH - clean battery bg --- data/elementary/themes/edc/battery.edc | 38 ++++++++++++---------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/data/elementary/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc index 7cf3cf537f..2fd35fa0a3 100644 --- a/data/elementary/themes/edc/battery.edc +++ b/data/elementary/themes/edc/battery.edc @@ -16,8 +16,7 @@ group { name: "e/modules/battery/main"; parts { part { name: "pulse_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } description { state: "faded" 0.0; inherit: "default" 0.0; @@ -27,8 +26,7 @@ group { name: "e/modules/battery/main"; part { name: "fill_clip_dim"; type: RECT; clip_to: "pulse_clip"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -38,14 +36,12 @@ group { name: "e/modules/battery/main"; part { name: "fill_clip"; type: RECT; clip_to: "fill_clip_dim"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; } } part { name: "info_clip"; type: RECT; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; color: 255 255 255 0; } description { state: "visible" 0.0; @@ -58,14 +54,13 @@ group { name: "e/modules/battery/main"; description { state: "default" 0.0; aspect: 1.0 1.0; aspect_preference: BOTH; image.normal: "bat_base.png"; - color: 0 0 0 64; + color: 32 32 32 255; } } part { name: "fill"; clip_to: "fill_clip"; description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; image.normal: "bat_base.png"; color: 160 160 160 255; } @@ -79,8 +74,7 @@ group { name: "e/modules/battery/main"; clip_to: "info_clip"; description { state: "default" 0.0; align: 0.5 0.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; rel1.relative: 0.2 0.15; rel2.relative: 0.8 0.53; color: 255 255 255 255; @@ -98,8 +92,7 @@ group { name: "e/modules/battery/main"; clip_to: "info_clip"; description { state: "default" 0.0; align: 0.5 1.0; - rel1.to: "bg"; - rel2.to: "bg"; + rel.to: "bg"; rel1.relative: 0.2 0.47; rel2.relative: 0.8 0.85; color: 255 255 255 255; @@ -119,13 +112,11 @@ group { name: "e/modules/battery/main"; } } programs { - program { - signal: "e,state,charging"; source: "e"; + program { signal: "e,state,charging"; source: "e"; action: STATE_SET "charging" 0.0; target: "fill"; } - program { - signal: "e,state,discharging"; source: "e"; + program { signal: "e,state,discharging"; source: "e"; action: STATE_SET "default" 0.0; target: "fill"; } @@ -142,8 +133,7 @@ group { name: "e/modules/battery/main"; target: "pulse_clip"; after: "pulse"; } - program { - signal: "e,action,pulse,stop"; source: "e"; + program { signal: "e,action,pulse,stop"; source: "e"; action: ACTION_STOP; target: "pulse"; target: "pulse2"; @@ -154,15 +144,13 @@ group { name: "e/modules/battery/main"; action: STATE_SET "default" 0.0; target: "pulse_clip"; } - program { - signal: "mouse,in"; source: "over"; + program { signal: "mouse,in"; source: "over"; action: STATE_SET "visible" 0.0; transition: SINUSOIDAL 0.3; target: "info_clip"; target: "fill_clip_dim"; } - program { - signal: "mouse,out"; source: "over"; + program { signal: "mouse,out"; source: "over"; action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.3; target: "info_clip"; --
