diff options
Diffstat (limited to 'data/themes/default/edc/elm/slider.edc')
| -rw-r--r-- | data/themes/default/edc/elm/slider.edc | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/data/themes/default/edc/elm/slider.edc b/data/themes/default/edc/elm/slider.edc index 1b1c324..f1b3e18 100644 --- a/data/themes/default/edc/elm/slider.edc +++ b/data/themes/default/edc/elm/slider.edc @@ -53,15 +53,15 @@ group { name: "elm/slider/horizontal/default"; new i = m & INVERT; if (i) { if (!d) { - set_state(PART:"base", "default", 0.0); + set_state(PART:"basebar", "default", 0.0); } else { - set_state(PART:"base", "disabled", 0.0); + set_state(PART:"basebar", "disabled", 0.0); } } else { if (!d) { - set_state(PART:"base", "default", 0.0); + set_state(PART:"basebar", "default", 0.0); } else { - set_state(PART:"base", "disabled", 0.0); + set_state(PART:"basebar", "disabled", 0.0); } } if (l) { @@ -110,10 +110,10 @@ group { name: "elm/slider/horizontal/default"; } parts { part { name: "elm.swallow.bar"; type: SWALLOW; - scale: 1; + scale: 0; description { state: "default" 0.0; - min: 42 14; - max: 99999 14; + min: 42 10; + max: 99999 10; align: 1.0 0.5; rel1.to_x: "elm.swallow.icon"; rel1.relative: 1.0 0.0; @@ -124,6 +124,10 @@ group { name: "elm/slider/horizontal/default"; } } part { name: "base"; mouse_events: 0; + description { state: "default" 0.0; + } + } + part { name: "basebar"; mouse_events: 0; description { state: "default" 0.0; rel1.to: "elm.swallow.bar"; rel2.to: "elm.swallow.bar"; @@ -141,8 +145,8 @@ group { name: "elm/slider/horizontal/default"; } part { name: "bevel"; mouse_events: 0; description { state: "default" 0.0; - rel1.to: "base"; - rel2.to: "base"; + rel1.to: "basebar"; + rel2.to: "basebar"; image.normal: "slider_run_bevel_horiz.png"; image.border: 5 5 0 0; fill.smooth: 0; @@ -253,11 +257,13 @@ group { name: "elm/slider/horizontal/default"; rel2.offset: -3 -3; } } - part { name: "sizer.content.values"; type: TEXT; mouse_events: 0; + part { name: "elm.content.values"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; visible: 0; fixed: 1 1; + rel1.offset: 1 1; + rel2.offset: -1 -1; rel1.relative: 0.0 (2/3); rel2.relative: 1.0 (3/3); text { @@ -272,15 +278,13 @@ group { name: "elm/slider/horizontal/default"; description { state: "default" 0.0; visible: 0; fixed: 1 1; - //rel1.to_x: "limits"; - //rel2.to_x: "limits"; - rel1.relative: 0.0 (2/3); - rel2.relative: 0.0 (3/3); + rel1.to: "elm.content.values"; + rel2.to: "elm.content.values"; color: FN_COL_DEFAULT; color_class: "slider_text"; text { font: FN; text_class: "slider"; - align: 1.0 0.5; + align: 0.25 0.5; min: 1 1; ellipsis: -1; } @@ -300,17 +304,14 @@ group { name: "elm/slider/horizontal/default"; description { state: "default" 0.0; visible: 0; align: 1.0 0.5; - // TODO move this to hug the 'units' element - rel1.relative: 1.0 (2/3); - rel2.relative: 1.0 (3/3); + rel1.to: "elm.content.values"; + rel2.to: "elm.content.values"; + rel1.relative: 0.75 0.5; /* TODO 'align to 0.5' */ + rel2.relative: 0.75 0.5; } description { state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - aspect: 1.0 1.0; - aspect_preference: VERTICAL; - rel1.offset: -3 2; - rel2.offset: -3 -3; } } part { name: "sizer.content.end"; type: TEXT; mouse_events: 0; |