raster pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=cddd47c9b7a40f62038e7c95573e4eebea816d8f
commit cddd47c9b7a40f62038e7c95573e4eebea816d8f Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Mar 12 14:11:28 2020 +0000 clean/fix art show if same art img 2 times in a row and limit size now ary images are limited to a 280x280 box which looks so much nicer than it being badly scaled --- data/themes/default.edc | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ src/bin/win.c | 2 ++ 2 files changed, 54 insertions(+) diff --git a/data/themes/default.edc b/data/themes/default.edc index 466e1db..386c9e5 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -337,6 +337,7 @@ collections { } part { name: "art_clip"; type: RECT; clip_to: "speaker_clip"; + scale: 1; description { state: "default" 0.0; visible: 0; color: 255 255 255 0; @@ -344,6 +345,7 @@ collections { rel2.relative: 1.5 1.5; fixed: 1 1; aspect: 1.0 1.0; aspect_preference: NONE; + max: 560 560; } description { state: "visible" 0.0; inherit: "default" 0.0; @@ -351,6 +353,7 @@ collections { rel2.relative: 1.0 1.0; visible: 1; color: 255 255 255 255; + max: 280 280; } } part { name: "art_clip2"; type: RECT; @@ -359,6 +362,34 @@ collections { fixed: 1 1; } } + part { name: "art_clip3"; type: RECT; + description { state: "default" 0.0; + visible: 0; + color: 255 255 255 0; + fixed: 1 1; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + visible: 1; + color: 255 255 255 255; + } + } + part { name: "artshadow"; mouse_events: 0; + clip_to: "art_clip3"; + description { state: "default" 0.0; + fixed: 1 1; + rel.to: "art_clip"; + color: 255 255 255 128; + image.normal: "win_shadow.png"; + image.border: 14 14 14 14; + image.middle: 0; + rel1.offset: -7 -3; + rel2.offset: 6 11; + fill.smooth: 0; + } + } part { name: "rage.art"; type: SWALLOW; mouse_events: 0; clip_to: "art_clip2"; description { state: "default" 0.0; @@ -399,20 +430,41 @@ collections { } } + program { signal: "state,novideo"; source: "rage"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.2; + target: "art_clip"; + target: "art_clip3"; + } + program { signal: "state,default"; source: "rage"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.2; + target: "art_clip"; + target: "art_clip3"; + } + program { signal: "state,video"; source: "rage"; + action: STATE_SET "default" 0.0; + transition: ACCELERATE 0.2; + target: "art_clip"; + target: "art_clip3"; + } program { signal: "action,newvid"; source: "rage"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.2; target: "art_clip"; + target: "art_clip3"; } program { signal: "state,noart"; source: "rage"; action: STATE_SET "default" 0.0; transition: ACCELERATE 0.3; target: "art_clip"; + target: "art_clip3"; } program { signal: "state,art"; source: "rage"; action: STATE_SET "visible" 0.0; transition: DECELERATE 0.3; target: "art_clip"; + target: "art_clip3"; } part { name: "rage.gesture"; type: SWALLOW; diff --git a/src/bin/win.c b/src/bin/win.c index 589d0fc..ba4c8cf 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -741,6 +741,8 @@ win_art(Evas_Object *win, const char *path) evas_object_del(inf->artimg); inf->artimg = NULL; } + else + elm_layout_signal_emit(inf->lay, "state,art", "rage"); } if (!inf->artimg) { --
