raster pushed a commit to branch feature/themes/flat.
http://git.enlightenment.org/core/efl.git/commit/?id=94002cc458f7d10d39461e0bce0e9df0a5603774
commit 94002cc458f7d10d39461e0bce0e9df0a5603774
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Sat May 12 02:24:21 2018 +0900
TH - progress - move to the same busy anim on ibar/wins... and
also add a hidden style for the wheel style so it has no bg so it can
hide until things are busy, and add bare style h/v bars with nothing
but a rect (and a bg) with with a hidden version to use as progress
bars like android does - along the edge of some element flush with the
edge... :)
---
data/elementary/themes/edc/elm/progress.edc | 404 +++++++++++++++++++++++++++-
1 file changed, 402 insertions(+), 2 deletions(-)
diff --git a/data/elementary/themes/edc/elm/progress.edc
b/data/elementary/themes/edc/elm/progress.edc
index 4bfac1d3b2..849e4f3d39 100644
--- a/data/elementary/themes/edc/elm/progress.edc
+++ b/data/elementary/themes/edc/elm/progress.edc
@@ -757,7 +757,407 @@ group { name: "elm/progressbar/vertical/default";
#undef DISABLE
}
+group { name: "elm/progressbar/horizontal/bare";
+ parts {
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "pulse_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ visible: 0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "fract_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 10 5;
+ max: -1 5;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ }
+ part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "elm.swallow.bar";
+ dragable.x: 1 1 1;
+ dragable.y: 0 0 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ max: 1 9999;
+ rel1.to: "elm.swallow.bar";
+ rel2.to: "elm.swallow.bar";
+ }
+ }
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 1 0;
+ max: 1 9999;
+ rel1.to_x: "elm.cur.progressbar";
+ rel2.to_x: "elm.cur.progressbar";
+ align: 1.0 0.5;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.0 0.5;
+ }
+ }
+ part { name: "bar"; type: RECT;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_x: "barend";
+ rel2.to_y: "bg";
+ color: 51 153 255 255;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_x: "barend";
+ rel2.to_x: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 5;
+ max: 5 9999;
+ rel1.to: "elm.swallow.bar";
+ rel2.to: "elm.swallow.bar";
+ align: 0.0 0.5;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 1.0 0.5;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "elm,state,inverted,on"; source: "elm";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "elm,state,inverted,off"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "elmpulse-stop";
+ signal: "elm,state,pulse,stop"; source: "elm";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "elm/progressbar/horizontal/hidden_bare";
+ inherit: "elm/progressbar/horizontal/bare";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "elm/progressbar/vertical/bare";
+ parts {
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "pulse_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ visible: 0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part { name: "fract_clip"; type: RECT;
+ description { state: "default" 0.0;
+ rel1.relative: -2.0 -2.0;
+ rel2.relative: 3.0 3.0;
+ }
+ description { state: "pulse" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
+ part { name: "bg"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ min: 5 10;
+ max: 5 -1;
+ color: DARK_GREY_BG_COLOR;
+ }
+ }
+ part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to: "bg";
+ }
+ }
+ part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
+ dragable.confine: "elm.swallow.bar";
+ dragable.x: 0 0 0;
+ dragable.y: 1 1 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 1 1;
+ max: 9999 1;
+ rel1.to: "elm.swallow.bar";
+ rel2.to: "elm.swallow.bar";
+ }
+ }
+ part { name: "barend"; type: SPACER;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ max: 9999 1;
+ rel1.to_y: "elm.cur.progressbar";
+ rel2.to_y: "elm.cur.progressbar";
+ align: 0.5 1.0;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 0.0;
+ }
+ }
+ part { name: "bar"; type: RECT;
+ scale: 1;
+ clip_to: "fract_clip";
+ description { state: "default" 0.0;
+ rel1.to: "bg";
+ rel2.to_y: "barend";
+ rel2.to_x: "bg";
+ color: 51 153 255 255;
+ offscale;
+ }
+ description { state: "inv" 0.0;
+ inherit: "default" 0.0;
+ rel1.to_y: "barend";
+ rel2.to_y: "bg";
+ }
+ }
+ part { name: "pulse"; type: RECT;
+ clip_to: "pulse_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 5 10;
+ max: 9999 10;
+ rel1.to: "elm.swallow.bar";
+ rel2.to: "elm.swallow.bar";
+ align: 0.5 0.0;
+ color: 51 153 255 255;
+ }
+ description { state: "end" 0.0;
+ inherit: "default" 0.0;
+ align: 0.5 1.0;
+ }
+ }
+ }
+ programs {
+ program { name: "inverted-on";
+ signal: "elm,state,inverted,on"; source: "elm";
+ action: STATE_SET "inv" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "inverted-off";
+ signal: "elm,state,inverted,off"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "bar";
+ target: "barend";
+ }
+ program { name: "pulse-mode1";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ target: "fract_clip";
+ }
+ program { name: "pulse-start";
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "pulse" 0.0;
+ target: "pulse_clip";
+ target: "fract_clip";
+ after: "pulse0";
+ }
+ program { name: "pulse0";
+ action: STATE_SET "end" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse1";
+ }
+ program { name: "pulse1";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.8;
+ target: "pulse";
+ after: "pulse0";
+ }
+ program { name: "elmpulse-stop";
+ signal: "elm,state,pulse,stop"; source: "elm";
+ action: ACTION_STOP;
+ target: "pulse0";
+ target: "pulse1";
+ after: "pulse-stop";
+ }
+ program { name: "pulse-stop";
+ action: STATE_SET "default" 0.0;
+ target: "pulse_clip";
+ }
+ }
+}
+
+group { name: "elm/progressbar/vertical/hidden_bare";
+ inherit: "elm/progressbar/vertical/bare";
+ parts {
+ part { name: "bg";
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ }
+ }
+ }
+}
+
+group { name: "elm/progressbar/horizontal/hidden_wheel";
+ alias: "elm/progressbar/vertical/hidden_wheel";
+ IMAGE_RING("ringa", 160)
+ IMAGE_RING("ringb", 160)
+ IMAGE_RING("ringc", 160)
+ parts {
+ part { name: "elm.swallow.bar" ; type: SWALLOW; mouse_events: 0;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ part { name: "elm.swallow.content"; type: SWALLOW;
+ description { state: "default" 0.0;
+ fixed: 1 1;
+ min: 0 0;
+ max: 0 0;
+ visible: 0;
+ }
+ }
+ BUSY("base", "elm,state,pulse,start", "elm", "elm,state,pulse,stop",
"elm")
+ part { name: "base"; type: RECT;
+ scale: 1;
+ description { state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1.offset: 4 4;
+ rel2.offset: -5 -5;
+ min: 40 40;
+ max: 40 40;
+ offscale;
+ }
+ }
+ }
+}
+
group { name: "elm/progressbar/horizontal/wheel";
+ inherit: "elm/progressbar/horizontal/hidden_wheel";
+ alias: "elm/progressbar/vertical/wheel";
+ images.image: "speaker_vol.png" COMP;
+ parts {
+ part { name: "bg"; nomouse;
+ insert_before: "base";
+ description { state: "default" 0.0;
+ image.normal: "speaker_vol.png";
+ rel.to:"base";
+ color: 48 48 48 255;
+ }
+ description { state: "hidden" 0.0;
+ inherit;
+ color: 48 48 48 0;
+ visible: 0;
+ }
+ }
+ program {
+ signal: "elm,state,pulse,start"; source: "elm";
+ action: STATE_SET "hidden" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "bg";
+ }
+ program {
+ signal: "elm,state,pulse,stop"; source: "elm";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 1.0;
+ target: "bg";
+ }
+ }
+}
+
+group { name: "elm/progressbar/horizontal/bar";
alias: "elm/progressbar/horizontal/fileselector/default";
set { name: "spinner";
image { image: "spinner-32.png" COMP; size: 17 45 9999 9999; }
@@ -1001,8 +1401,8 @@ group { name: "elm/progressbar/horizontal/wheel";
}
}
-group { name: "elm/progressbar/vertical/wheel";
- inherit: "elm/progressbar/horizontal/wheel";
+group { name: "elm/progressbar/vertical/bar";
+ inherit: "elm/progressbar/horizontal/bar";
parts {
part { name: "spin1";
description { state: "default" 0.0;
--
