discomfitor pushed a commit to branch master. http://git.enlightenment.org/themes/darkness.git/commit/?id=f935cf4fb3da23382ae2fe4d5d40e3a9ec0f8778
commit f935cf4fb3da23382ae2fe4d5d40e3a9ec0f8778 Author: discomfitor <[email protected]> Date: Wed Jan 1 02:34:01 2014 -0500 greatly improve slider appearance --- elm/widgets/slider.edc | 103 +++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 63 deletions(-) diff --git a/elm/widgets/slider.edc b/elm/widgets/slider.edc index 8c10fec..f35336e 100644 --- a/elm/widgets/slider.edc +++ b/elm/widgets/slider.edc @@ -69,7 +69,7 @@ group { name: "elm/slider/hidden/limit"; group { name: "elm/slider/horizontal/default"; alias: "elm/slider/horizontal/disabled"; images { - image: "slider_bar.png" COMP; + image: "scroll_border_h.png" COMP; image: "frame_label_under.png" COMP; } parts { @@ -78,13 +78,14 @@ group { name: "elm/slider/hidden/limit"; description { state: "default" 0.0; max: 99999 6; min: 0 6; - rel1 { to: "bg"; - offset: 1 0; + rel1 { to: "elm.swallow.bar"; + offset: -1 -1; } - rel2 { to: "bg"; - offset: -2 -1; + rel2 { to: "elm.swallow.bar"; + offset: 2 2; } - image.normal: "slider_bar.png"; + image.normal: "scroll_border_h.png"; + image.border: 4 4 1 1; fill.smooth: 0; } } @@ -93,11 +94,12 @@ group { name: "elm/slider/hidden/limit"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; - rel2 { - to_y: "base"; - to_x: "elm.dragable.slider"; - } + rel1.to_x: "elm.swallow.bar"; + rel1.to_y: "base"; + rel1.offset: 0 1; + rel2.to_x: "elm.dragable.slider"; + rel2.to_y: "base"; + rel2.offset: -1 -2; color: DARKNESS_BUTTON_BLUE 200; } description { state: "inverted" 0.0; @@ -113,17 +115,6 @@ group { name: "elm/slider/hidden/limit"; visible: 0; } } - part { name: "bg"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - color: 0 0 0 0; - } - } part { name: "elm.swallow.bar"; type: SWALLOW; scale: 1; @@ -137,7 +128,7 @@ group { name: "elm/slider/hidden/limit"; offset: 8 0; } rel2 { - to_x: "elm.units"; + to_x: "limits"; relative: 0.0 1.0; offset: -10 -1; } @@ -194,11 +185,6 @@ group { name: "elm/slider/hidden/limit"; rel1.offset: 0 4; rel2.offset: 0 -5; } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - color: 255 128 128 128; - visible: 0; - } description { state: "disabled_visible" 0.0; inherit: "default" 0.0; color: DARKNESS_TEXT_DISABLED 128; @@ -328,19 +314,19 @@ group { name: "elm/slider/hidden/limit"; dragable { x: 1 1 0; y: 0 0 0; - confine: "bg"; + confine: "elm.swallow.bar"; } description { state: "default" 0.0; min: 0 24; max: 0 24; fixed: 1 1; rel1 { - relative: 0.5 0.0; - to_x: "bg"; + relative: 0.5 0.5; + to: "elm.swallow.bar"; } rel2 { - relative: 0.5 1.0; - to_x: "bg"; + relative: 0.5 0.5; + to: "elm.swallow.bar"; } color: DARKNESS_BUTTON_BLUE 100; } @@ -491,7 +477,7 @@ group { name: "elm/slider/hidden/limit"; group { name: "elm/slider/vertical/default"; images { - image: "slider_bar_v.png" COMP; + image: "scroll_border_v.png" COMP; image: "frame_label_under.png" COMP; } parts { @@ -500,13 +486,14 @@ group { name: "elm/slider/hidden/limit"; description { state: "default" 0.0; max: 6 99999; min: 6 0; - rel1 { to: "bg"; - offset: 1 0; + rel1 { to: "elm.swallow.bar"; + offset: -1 -1; } - rel2 { to: "bg"; - offset: -2 -1; + rel2 { to: "elm.swallow.bar"; + offset: 2 2; } - image.normal: "slider_bar_v.png"; + image.normal: "scroll_border_v.png"; + image.border: 1 1 4 4; fill.smooth: 0; } } @@ -515,12 +502,12 @@ group { name: "elm/slider/hidden/limit"; mouse_events: 0; description { state: "default" 0.0; fixed: 1 1; - rel1.to: "base"; - rel2 { - to_x: "base"; - to_y: "elm.dragable.slider"; - relative: 1.0 0.5; - } + rel1.to_x: "base"; + rel1.to_y: "elm.swallow.bar"; + rel1.offset: 1 0; + rel2.to_x: "base"; + rel2.to_y: "elm.dragable.slider"; + rel2.offset: -2 -1; color: DARKNESS_BUTTON_BLUE 200; } description { state: "inverted" 0.0; @@ -536,17 +523,6 @@ group { name: "elm/slider/hidden/limit"; visible: 0; } } - part { name: "bg"; - type: RECT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1.to: "elm.swallow.bar"; - rel2.to: "elm.swallow.bar"; - color: 0 0 0 0; - } - } part { name: "elm.swallow.bar"; type: SWALLOW; scale: 1; @@ -735,19 +711,19 @@ group { name: "elm/slider/hidden/limit"; dragable { x: 0 0 0; y: 1 1 0; - confine: "bg"; + confine: "elm.swallow.bar"; } description { state: "default" 0.0; min: 24 0; max: 24 0; fixed: 1 1; rel1 { - relative: 0.5 0.0; - to_y: "bg"; + relative: 0.5 0.0; + to_y: "elm.swallow.bar"; } rel2 { - relative: 0.5 1.0; - to_y: "bg"; + relative: 0.5 1.0; + to_y: "elm.swallow.bar"; } color: 0 0 0 0; } @@ -918,6 +894,7 @@ group { name: "elm/slider/hidden/limit"; } part { name: "button"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; fixed: 1 1; min: 32 32; @@ -925,7 +902,6 @@ group { name: "elm/slider/hidden/limit"; color: 175 175 175 255; image { normal: "slider_button.png"; - border: 5 5 5 10; } fill.smooth: 0; } @@ -942,10 +918,11 @@ group { name: "elm/slider/hidden/limit"; } } } - FOCUS_GLOW(0.0, 0.0, 0, 0, "button", 1.0, 1.0, -1, -1, "button") + FOCUS_GLOW(0.2, 0.2, 0, 0, "button", 0.7, 0.7, -1, -1, "button") part { name: "slider_glow"; mouse_events: 0; + scale: 1; description { state: "default" 0.0; color: 255 255 255 0; --
