From 095550fdfa0e00c143bbb12d4c603448bc39d5f1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 30 May 2013 15:00:21 +0100 Subject: [PATCH] fix border shading animation size and shadow geometry --- data/themes/edc/border.edc | 42 +++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc index 74514f818..d6f3a1647 100644 --- a/data/themes/edc/border.edc +++ b/data/themes/edc/border.edc @@ -428,7 +428,16 @@ group { name: "e/widgets/border/default/border"; visible: 0; } } - part { name: "shadow"; mouse_events: 0; + part { name: "shadow_clip"; type: RECT; mouse_events: 0; + description { state: "default"; + rel1.to: "shadow"; + rel2.to: "shadow"; + } + description { state: "hidden"; + visible: 0; + } + } + part { name: "shadow"; mouse_events: 0; clip_to: "shadow_clip"; description { state: "default" 0.0; image.normal: "win_shadow.png"; image.border: 14 14 14 14; @@ -439,9 +448,9 @@ group { name: "e/widgets/border/default/border"; rel2.offset: 6 11; fill.smooth: 0; } - description { state: "hidden" 0.0; - inherit: "default" 0.0; - visible: 0; + description { state: "shaded"; + inherit: "default"; + rel2.to: "top"; } } part { name: "e.event.resize.bl"; type: RECT; @@ -528,12 +537,12 @@ group { name: "e/widgets/border/default/border"; program { signal: "e,state,shadow,on"; source: "e"; action: STATE_SET "default" 0.0; - target: "shadow"; + target: "shadow_clip"; } program { signal: "e,state,shadow,off"; source: "e"; action: STATE_SET "hidden" 0.0; - target: "shadow"; + target: "shadow_clip"; } program { signal: "e,state,focused"; source: "e"; @@ -614,6 +623,12 @@ group { name: "e/widgets/border/default/border"; program { signal: "e,state,shaded"; source: "e"; action: STATE_SET "shaded" 0.0; + target: "shadow"; + after: "shading"; + } + program { name: "shading"; + signal: "e,state,shading"; source: "e"; + action: STATE_SET "shaded" 0.0; target: "e.swallow.client"; target: "bottom"; target: "bevel2"; @@ -621,22 +636,21 @@ group { name: "e/widgets/border/default/border"; target: "e.event.resize.b"; target: "e.event.resize.br"; } -// program { -// signal: "e,state,shading"; source: "e"; -// } program { signal: "e,state,unshaded"; source: "e"; + action: STATE_SET "default" 0.0; + target: "bottom"; + target: "bevel2"; + target: "e.event.resize.bl"; + target: "e.event.resize.b"; + target: "e.event.resize.br"; after: "unshading"; } program { name: "unshading"; signal: "e,state,unshading"; source: "e"; action: STATE_SET "default" 0.0; target: "e.swallow.client"; - target: "bottom"; - target: "bevel2"; - target: "e.event.resize.bl"; - target: "e.event.resize.b"; - target: "e.event.resize.br"; + target: "shadow"; } // program { // signal: "e,action,maximize"; source: "e";