progressbar: add slider style argument in create function 42/43542/1
authorJehun Lim <jehun.lim@samsung.com>
Fri, 10 Jul 2015 04:32:17 +0000 (13:32 +0900)
committerJehun Lim <jehun.lim@samsung.com>
Fri, 10 Jul 2015 04:32:17 +0000 (13:32 +0900)
Change-Id: I200c6ac8734672e6e27bb52ae7ddfd112c12ce95
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>
include/util/progressbar.h
src/util/progressbar.c
src/view/viewer.c

index c93a87e..792dcc8 100644 (file)
@@ -24,7 +24,7 @@ struct progressbar_ops {
        int (*set_value)(void *data);
 };
 
-struct progressbar *progressbar_create(Evas_Object *base);
+struct progressbar *progressbar_create(Evas_Object *base, const char *style);
 void progressbar_destroy(struct progressbar *m);
 
 void progressbar_set_parts(struct progressbar *m, const char *slider,
index 853b507..756c44a 100644 (file)
@@ -207,7 +207,7 @@ void progressbar_set_parts(struct progressbar *m, const char *slider,
                m->str_separator = strdup(separator);
 }
 
-struct progressbar *progressbar_create(Evas_Object *base)
+struct progressbar *progressbar_create(Evas_Object *base, const char *style)
 {
        struct progressbar *m;
        Evas_Object *obj;
@@ -227,10 +227,12 @@ struct progressbar *progressbar_create(Evas_Object *base)
 
        elm_slider_indicator_show_set(obj, EINA_FALSE);
        elm_slider_indicator_show_on_focus_set(obj, EINA_FALSE);
-       elm_object_style_set(obj, STYLE_VIEWER_PROGRESS);
        elm_slider_horizontal_set(obj, EINA_TRUE);
        elm_slider_step_set(obj, SLIDER_DEFAULT);
 
+       if (style)
+               elm_object_style_set(obj, style);
+
        /* FIXME: focus disabled */
        elm_object_focus_allow_set(obj, EINA_FALSE);
 
index e3a9a8a..0e8db1c 100644 (file)
@@ -775,7 +775,7 @@ static bool _ui_init(struct _priv *priv)
                        goto err;
        }
 
-       prog = progressbar_create(priv->base);
+       prog = progressbar_create(priv->base, STYLE_VIEWER_PROGRESS);
        if (!prog) {
                _ERR("failed to adding progressbar");
                goto err;