[EGIT] [core/elementary] master 02/02: improve slider test to test more cases and not mess up 1 icon.

[Rasterman]

raster pushed a commit to branch master.

commit e561fe6f6e64a8a2968e7237ba3220977251f090
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Mon Apr 1 22:23:32 2013 +0900

    improve slider test to test more cases and not mess up 1 icon.
---
 src/bin/test_slider.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c
index f18a3ef..2eabe73 100644
--- a/src/bin/test_slider.c
+++ b/src/bin/test_slider.c
@@ -101,6 +101,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event_info
    sl = elm_slider_add(win);
    elm_object_text_set(sl, "Horizontal inverted");
    elm_object_part_content_set(sl, "end", ic);
+   elm_slider_unit_format_set(sl, "%3.0f units");
    elm_slider_span_size_set(sl, 80);
    evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
@@ -183,6 +184,13 @@ test_slider(void *data __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event_info
 
    evas_object_smart_callback_add(sl1, "changed", _change_cb, sl);
 
+   /* vertical disable state */
+
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", 
elm_app_data_dir_get());
+   elm_image_file_set(ic, buf, NULL);
+   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
+
    sl = elm_slider_add(win);
    elm_object_part_content_set(sl, "icon", ic);
    elm_object_text_set(sl, "Disabled vertical");
@@ -200,25 +208,18 @@ test_slider(void *data __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event_info
    evas_object_show(ic);
    evas_object_show(sl);
 
-   /* vertical disable state */
-   ic = elm_icon_add(win);
-   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", 
elm_app_data_dir_get());
-   elm_image_file_set(ic, buf, NULL);
-   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
-
    sl = elm_slider_add(win);
    elm_object_text_set(sl, "Vertical");
    elm_slider_unit_format_set(sl, "%1.1f units");
    elm_slider_span_size_set(sl, 60);
    evas_object_size_hint_align_set(sl, 0.5, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(sl, 0.0, EVAS_HINT_EXPAND);
-   elm_slider_indicator_format_set(sl, "%1.1f");
+   elm_slider_indicator_show_set(sl, EINA_FALSE);
    elm_slider_value_set(sl, 0.2);
    elm_object_scale_set(sl, 1.0);
    elm_slider_horizontal_set(sl, EINA_FALSE);
    evas_object_smart_callback_add(sl, "changed", _change_print_cb, sl);
    elm_box_pack_end(bx2, sl);
-   evas_object_show(ic);
    evas_object_show(sl);
 
    bx2 = elm_box_add(win);

-- 

------------------------------------------------------------------------------
Own the Future-Intel&reg; Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game 
on Steam. $5K grand prize plus 10 genre and skill prizes. 
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d