raster pushed a commit to branch feature/themes/flat. http://git.enlightenment.org/core/efl.git/commit/?id=09817872d68615da8d33eb74218dfe2ee09329b4
commit 09817872d68615da8d33eb74218dfe2ee09329b4 Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Dec 6 16:35:34 2018 +0000 TH - slider (e) --- data/elementary/themes/edc/slider.edc | 150 ++++++++++++++-------------------- 1 file changed, 60 insertions(+), 90 deletions(-) diff --git a/data/elementary/themes/edc/slider.edc b/data/elementary/themes/edc/slider.edc index c500234c2a..4dc4982f8d 100644 --- a/data/elementary/themes/edc/slider.edc +++ b/data/elementary/themes/edc/slider.edc @@ -1,63 +1,46 @@ group { name: "e/widgets/slider_horizontal"; - images.image: "slider_run_base_horiz.png" COMP; - images.image: "slider_run_bevel_horiz.png" COMP; - images.image: "slider_run_base_light_horiz.png" COMP; - images.image: "horiz_glow_run.png" COMP; - images.image: "knob_round_small_normal.png" COMP; - images.image: "knob_round_small_selected.png" COMP; + images.image: "speaker_vol.png" COMP; parts { part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 42 21; + min: 56 28; color: 0 0 0 0; + offscale; } description { state: "active" 0.0; inherit: "default" 0.0; rel2.relative: 0.0 1.0; - rel2.offset: -2 -1; + rel2.offset: -5 -1; rel2.to_x: "e.text.label"; } } - part { name: "base"; mouse_events: 0; + part { name: "base"; type: RECT; mouse_events: 0; + scale: 1; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - image.normal: "slider_run_base_horiz.png"; - image.border: 4 4 0 0; - fill.smooth: 0; - min: 8 5; - max: 99999 5; + color: 48 48 48 255; + min: 8 4; + max: 99999 4; fixed: 0 1; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "slider_run_base_light_horiz.png"; + color: 56 56 56 255; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "horiz_glow_run.png"; - rel1.offset: 1 1; rel1.to: "base"; rel2.relative: 0.5 1.0; - rel2.offset: -1 -2; rel2.to_x: "knob"; rel2.to_y: "base"; - image.border: 0 4 0 0; + color: 53 153 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "slider_run_bevel_horiz.png"; - image.border: 5 5 0 0; - fill.smooth: 0; + color: 192 192 192 64; } } part { name: "clip1"; type: RECT; @@ -70,15 +53,13 @@ group { name: "e/widgets/slider_horizontal"; } part { name: "e.text.label"; type: TEXT; mouse_events: 0; clip_to: "clip1"; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; - rel1.offset: -1 0; + rel1.offset: -5 4; rel1.relative: 1.0 0.0; - rel2.offset: -1 -1; + rel2.offset: -5 -5; align: 1.0 0.5; - color_class: "slider_text"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FN; size: 10; min: 0 1; align: 0.0 0.5; @@ -87,6 +68,7 @@ group { name: "e/widgets/slider_horizontal"; visible: 0; max: 0 0; fixed: 1 1; + offscale; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -107,13 +89,11 @@ group { name: "e/widgets/slider_horizontal"; } part { name: "label2"; type: TEXT; mouse_events: 0; clip_to: "clip2"; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.to: "e.text.label"; rel2.to: "e.text.label"; - color_class: "slider_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; text { font: FN; size: 10; text_source: "e.text.label"; align: 0.0 0.5; @@ -127,27 +107,31 @@ group { name: "e/widgets/slider_horizontal"; } } part { name: "knob"; + scale: 1; description { state: "default" 0.0; rel1.offset: -1 -1; rel1.to: "e.dragable.slider"; rel2.offset: 0 0; rel2.to: "e.dragable.slider"; - image.normal: "knob_round_small_normal.png"; - min: 23 23; - max: 23 23; + color: 160 160 160 255; + image.normal: "speaker_vol.png"; + min: 16 16; + max: 16 16; fixed: 1 1; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "knob_round_small_selected.png"; + color: 255 255 255 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 96 96 96 255; } } part { name: "e.swallow.bar"; type: SWALLOW; description { state: "default" 0.0; rel1.to_x: "bg"; - rel1.offset: 1 0; rel2.to_x: "bg"; - rel2.offset: -2 -1; } } part { name: "e.dragable.slider"; type: RECT; @@ -156,8 +140,8 @@ group { name: "e/widgets/slider_horizontal"; dragable.y: 0 0 0; dragable.confine: "bg"; description { state: "default" 0.0; - min: 21 21; - max: 21 21; + min: 16 16; + max: 16 16; rel1.relative: 0.5 0.0; rel1.to_x: "bg"; rel2.relative: 0.5 1.0; @@ -210,6 +194,7 @@ group { name: "e/widgets/slider_horizontal"; target: "base"; target: "clip1"; target: "clip2"; + target: "knob"; } program { signal: "e,state,enabled"; source: "e"; @@ -219,70 +204,53 @@ group { name: "e/widgets/slider_horizontal"; target: "base"; target: "clip1"; target: "clip2"; + target: "knob"; } } } group { name: "e/widgets/slider_vertical"; - images.image: "slider_run_base_vert.png" COMP; - images.image: "slider_run_bevel_vert.png" COMP; - images.image: "slider_run_base_light_vert.png" COMP; - images.image: "vert_glow_run.png" COMP; - images.image: "knob_round_small_normal.png" COMP; - images.image: "knob_round_small_selected.png" COMP; + images.image: "speaker_vol.png" COMP; parts { part { name: "bg"; type: RECT; scale: 1; description { state: "default" 0.0; - min: 21 42; + min: 28 56; color: 0 0 0 0; + offscale; } description { state: "active" 0.0; inherit: "default" 0.0; rel2.relative: 1.0 0.0; - rel2.offset: -1 -2; + rel2.offset: -1 -5; rel2.to_y: "e.text.label"; } } - part { name: "base"; mouse_events: 0; + part { name: "base"; type: RECT; mouse_events: 0; description { state: "default" 0.0; rel1.to: "bg"; rel2.to: "bg"; - image.normal: "slider_run_base_vert.png"; - image.border: 0 0 4 4; - fill.smooth: 0; - min: 5 8; - max: 5 99999; + color: 48 48 48 255; + min: 4 8; + max: 4 99999; fixed: 1 0; } description { state: "disabled" 0.0; inherit: "default" 0.0; - image.normal: "slider_run_base_light_vert.png"; + color: 56 56 56 255; } } - part { name: "glow"; mouse_events: 0; + part { name: "glow"; type: RECT; mouse_events: 0; description { state: "default" 0.0; - image.normal: "vert_glow_run.png"; - rel1.offset: 1 0; rel1.relative: 0.0 0.5; rel1.to_y: "knob"; rel1.to_x: "base"; - rel2.offset: -2 -2; rel2.to: "base"; - image.border: 0 0 0 4; + color: 53 153 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 255 255 64; - } - } - part { name: "bevel"; mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; - image.normal: "slider_run_bevel_vert.png"; - image.border: 0 0 5 5; - fill.smooth: 0; + color: 192 192 192 64; } } part { name: "clip1"; type: RECT; @@ -295,15 +263,13 @@ group { name: "e/widgets/slider_vertical"; } part { name: "e.text.label"; type: TEXT; mouse_events: 0; clip_to: "clip1"; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.offset: 0 -1; rel1.relative: 0.0 1.0; rel2.offset: -1 -1; align: 0.5 1.0; - color_class: "slider_text"; - color3: 255 255 255 255; + color: 160 160 160 255; text { font: FN; size: 10; min: 0 0; align: 0.5 0.5; @@ -312,6 +278,7 @@ group { name: "e/widgets/slider_vertical"; visible: 0; max: 0 0; fixed: 1 1; + offscale; } description { state: "active" 0.0; inherit: "default" 0.0; @@ -332,13 +299,11 @@ group { name: "e/widgets/slider_vertical"; } part { name: "label2"; type: TEXT; mouse_events: 0; clip_to: "clip2"; - effect: SHADOW BOTTOM; scale: 1; description { state: "default" 0.0; rel1.to: "e.text.label"; rel2.to: "e.text.label"; - color_class: "slider_text_disabled"; - color3: 255 255 255 255; + color: 96 96 96 255; text { font: FN; size: 10; text_source: "e.text.label"; align: 0.5 0.5; @@ -357,22 +322,25 @@ group { name: "e/widgets/slider_vertical"; rel1.to: "e.dragable.slider"; rel2.offset: 0 0; rel2.to: "e.dragable.slider"; - image.normal: "knob_round_small_normal.png"; - min: 23 23; - max: 23 23; + color: 160 160 160 255; + image.normal: "speaker_vol.png"; + min: 16 16; + max: 16 16; fixed: 1 1; } description { state: "clicked" 0.0; inherit: "default" 0.0; - image.normal: "knob_round_small_selected.png"; + color: 255 255 255 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 96 96 96 255; } } part { name: "e.swallow.bar"; type: SWALLOW; description { state: "default" 0.0; rel1.to_x: "bg"; - rel1.offset: 0 1; rel2.to_x: "bg"; - rel2.offset: -1 -2; } } part { name: "e.dragable.slider"; type: RECT; @@ -381,8 +349,8 @@ group { name: "e/widgets/slider_vertical"; dragable.y: -1 1 0; dragable.confine: "bg"; description { state: "default" 0.0; - min: 21 21; - max: 21 21; + min: 16 16; + max: 16 16; rel1.relative: 0.0 0.5; rel1.to_x: "bg"; rel2.relative: 1.0 0.5; @@ -435,6 +403,7 @@ group { name: "e/widgets/slider_vertical"; target: "base"; target: "clip1"; target: "clip2"; + target: "knob"; } program { signal: "e,state,enabled"; source: "e"; @@ -444,6 +413,7 @@ group { name: "e/widgets/slider_vertical"; target: "base"; target: "clip1"; target: "clip2"; + target: "knob"; } } } --
