Menu
▾
▴
E SVN: raster trunk/THEMES/dark/edje/edc/elm
|
From: Enlightenment S. <no-...@en...> - 2013-04-02 04:16:26
|
Log: and make sure slider icons have sizers too. Author: raster Date: 2013-04-01 21:16:19 -0700 (Mon, 01 Apr 2013) New Revision: 84481 Trac: http://trac.enlightenment.org/e/changeset/84481 Modified: trunk/THEMES/dark/edje/edc/elm/slider.edc Modified: trunk/THEMES/dark/edje/edc/elm/slider.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/slider.edc 2013-04-02 04:10:50 UTC (rev 84480) +++ trunk/THEMES/dark/edje/edc/elm/slider.edc 2013-04-02 04:16:19 UTC (rev 84481) @@ -106,13 +106,17 @@ } if (ic) { set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); } else { set_state(PART:"elm.swallow.icon", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); } if (e) { set_state(PART:"elm.swallow.end", "visible", 0.0); + set_state(PART:"sizer.content.end", "visible", 0.0); } else { set_state(PART:"elm.swallow.end", "default", 0.0); + set_state(PART:"sizer.content.end", "default", 0.0); } if (!d) { set_state(PART:"event", "default", 0.0); @@ -222,6 +226,26 @@ rel2.offset: 2 -3; } } + part { name: "sizer.content"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "slider_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.icon"; + rel2.to: "elm.swallow.icon"; + text { + min: 1 1; + text: "M"; + } + } + } part { name: "elm.text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; @@ -238,7 +262,7 @@ color3: 0 0 0 128; color_class: "slider_text"; text { font: "Sans"; size: 10; - text_class: "slider_text"; + text_class: "slider"; min: 0 0; align: 0.0 0.5; } @@ -277,6 +301,26 @@ rel2.offset: -3 -3; } } + part { name: "sizer.content.end"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "slider_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.end"; + rel2.to: "elm.swallow.end"; + text { + min: 1 1; + text: "M"; + } + } + } alias: "elm.units.min" "limits:elm.units.min"; alias: "elm.units.max" "limits:elm.units.max"; part { name: "limits"; type: GROUP; mouse_events: 0; @@ -313,7 +357,7 @@ color3: 0 0 0 128; color_class: "slider_text"; text { font: "Sans"; size: 10; - text_class: "slider_text"; + text_class: "slider"; min: 0 0; align: 1.0 0.5; } @@ -768,13 +812,17 @@ } if (ic) { set_state(PART:"elm.swallow.icon", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); } else { set_state(PART:"elm.swallow.icon", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); } if (e) { set_state(PART:"elm.swallow.end", "visible", 0.0); + set_state(PART:"sizer.content.end", "visible", 0.0); } else { set_state(PART:"elm.swallow.end", "default", 0.0); + set_state(PART:"sizer.content.end", "default", 0.0); } if (!d) { set_state(PART:"event", "default", 0.0); @@ -884,6 +932,26 @@ rel2.offset: -3 2; } } + part { name: "sizer.content"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "slider_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.icon"; + rel2.to: "elm.swallow.icon"; + text { + min: 1 1; + text: "M"; + } + } + } part { name: "elm.text"; type: TEXT; mouse_events: 0; effect: SHADOW BOTTOM; scale: 1; @@ -900,7 +968,7 @@ color3: 0 0 0 128; color_class: "slider_text"; text { font: "Sans"; size: 10; - text_class: "slider_text"; + text_class: "slider"; min: 1 0; align: 0.5 0.0; } @@ -938,6 +1006,26 @@ rel2.offset: -3 -3; } } + part { name: "sizer.content.end"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "slider_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.end"; + rel2.to: "elm.swallow.end"; + text { + min: 1 1; + text: "M"; + } + } + } alias: "elm.units.min" "limits:elm.units.min"; alias: "elm.units.max" "limits:elm.units.max"; part { name: "limits"; type: GROUP; mouse_events: 0; @@ -974,7 +1062,7 @@ color3: 0 0 0 128; color_class: "slider_text"; text { font: "Sans"; size: 10; - text_class: "slider_text"; + text_class: "slider"; min: 0 0; align: 0.5 1.0; } |
