From 7bb748c80905e4e5e2d3853dc74939445c9530e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=83=C2=A1vio=20Pontes?= Date: Thu, 9 Dec 2010 15:59:20 +0000 Subject: [PATCH] Fixing problems in disabled slider SVN revision: 55420 --- legacy/elementary/data/themes/default.edc | 49 ++++++++++++++++++++--- legacy/elementary/src/bin/test_slider.c | 2 + 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc index f33ec8054b..16c3d885b7 100644 --- a/legacy/elementary/data/themes/default.edc +++ b/legacy/elementary/data/themes/default.edc @@ -13718,6 +13718,14 @@ collections { inherit: "default" 0.0; visible: 0; } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 0 0 100; + } + description { state: "disabled_inverted" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "level2"; type: RECT; @@ -13739,7 +13747,6 @@ collections { } description { state: "disabled" 0.0; inherit: "default" 0.0; - color: 255 0 0 100; } description { state: "disabled_inverted" 0.0; inherit: "default" 0.0; @@ -14323,9 +14330,15 @@ collections { get_state(PART:"level2", st, 30, vl); if (!strcmp(st, "inverted")) + { + set_state(PART:"level", "disabled_inverted", 0.0); set_state(PART:"level2", "disabled_inverted", 0.0); + } else + { + set_state(PART:"level", "disabled", 0.0); set_state(PART:"level2", "disabled", 0.0); + } } } program { name: "enable"; @@ -14353,10 +14366,16 @@ collections { set_state(PART:"elm.units", "default", 0.0); get_state(PART:"level2", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"level2", "visible", 0.0); + if (!strcmp(st, "disabled_inverted")) + { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } else + { + set_state(PART:"level", "default", 0.0); set_state(PART:"level2", "default", 0.0); + } } } } @@ -14445,6 +14464,14 @@ collections { inherit: "default" 0.0; visible: 0; } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 0 0 100; + } + description { state: "disabled_inverted" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "level2"; type: RECT; @@ -15053,9 +15080,15 @@ collections { get_state(PART:"level2", st, 30, vl); if (!strcmp(st, "inverted")) + { + set_state(PART:"level", "disabled_inverted", 0.0); set_state(PART:"level2", "disabled_inverted", 0.0); + } else + { + set_state(PART:"level", "disabled", 0.0); set_state(PART:"level2", "disabled", 0.0); + } } } @@ -15084,10 +15117,16 @@ collections { set_state(PART:"elm.units", "default", 0.0); get_state(PART:"level2", st, 30, vl); - if (!strcmp(st, "visible")) - set_state(PART:"level2", "visible", 0.0); + if (!strcmp(st, "disabled_inverted")) + { + set_state(PART:"level", "inverted", 0.0); + set_state(PART:"level2", "inverted", 0.0); + } else + { + set_state(PART:"level", "default", 0.0); set_state(PART:"level2", "default", 0.0); + } } } } diff --git a/legacy/elementary/src/bin/test_slider.c b/legacy/elementary/src/bin/test_slider.c index 67d5a17857..6488cdab36 100644 --- a/legacy/elementary/src/bin/test_slider.c +++ b/legacy/elementary/src/bin/test_slider.c @@ -59,6 +59,8 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); + elm_slider_min_max_set(sl, 50, 150); + elm_slider_value_set(sl, 80); elm_object_disabled_set(sl, EINA_TRUE); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);