tizen 2.3.1 release
[framework/uifw/elementary.git] / src / lib / elm_slider.c
index 8f571a5..4ab13f9 100644 (file)
 #include <Elementary.h>
 #include "elm_priv.h"
+#include "elm_widget_slider.h"
 
-typedef struct _Widget_Data Widget_Data;
+EAPI const char ELM_SLIDER_SMART_NAME[] = "elm_slider";
 
-struct _Widget_Data
+static const Elm_Layout_Part_Alias_Description _content_aliases[] =
 {
-   Evas_Object *slider;
-   Evas_Object *icon;
-   Evas_Object *end;
-   Evas_Object *spacer;
-
-   Ecore_Timer *delay;
-
-   Eina_Hash  *labels;
-   const char *units;
-   const char *indicator;
-
-   char *(*indicator_format_func)(double val);
-   void (*indicator_format_free)(char *str);
-
-   char *(*units_format_func)(double val);
-   void (*units_format_free)(char *str);
-
-   double val, val_min, val_max, val2;
-   Evas_Coord size;
-   Evas_Coord downx, downy;
-
-   Eina_Bool horizontal : 1;
-   Eina_Bool inverted : 1;
-   Eina_Bool indicator_show : 1;
-   Eina_Bool spacer_down : 1;
-   Eina_Bool frozen : 1;
+   {"icon", "elm.swallow.icon"},
+   {"end", "elm.swallow.end"},
+   {NULL, NULL}
 };
 
-#define ELM_SLIDER_INVERTED_FACTOR (-1.0)
-
-static const char *widtype = NULL;
-static void _del_hook(Evas_Object *obj);
-static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
-static void _theme_hook(Evas_Object *obj);
-static void _disable_hook(Evas_Object *obj);
-static void _sizing_eval(Evas_Object *obj);
-static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static void _sub_del(void *data, Evas_Object *obj, void *event_info);
-static void _units_set(Evas_Object *obj);
-static void _val_set(Evas_Object *obj);
-static void _indicator_set(Evas_Object *obj);
-static void _on_focus_hook(void *data, Evas_Object *obj);
-static void _drag_up(void *data, Evas_Object *obj,
-                    const char *emission, const char *source);
-static void _drag_down(void *data, Evas_Object *obj,
-                    const char *emission, const char *source);
-static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
-                             Evas_Callback_Type type, void *event_info);
-static void _spacer_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
-static void _spacer_move_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
-static void _spacer_up_cb(void *data, Evas * e, Evas_Object * obj, void *event_info);
+static const Elm_Layout_Part_Alias_Description _text_aliases[] =
+{
+   {"default", "elm.text"},
+   {NULL, NULL}
+};
 
 static const char SIG_CHANGED[] = "changed";
 static const char SIG_DELAY_CHANGED[] = "delay,changed";
 static const char SIG_DRAG_START[] = "slider,drag,start";
 static const char SIG_DRAG_STOP[] = "slider,drag,stop";
-static const Evas_Smart_Cb_Description _signals[] = {
-  {SIG_CHANGED, ""},
-  {SIG_DELAY_CHANGED, ""},
-  {SIG_DRAG_START, ""},
-  {SIG_DRAG_STOP, ""},
-  {NULL, NULL}
+static const Evas_Smart_Cb_Description _smart_callbacks[] = {
+   {SIG_CHANGED, ""},
+   {SIG_DELAY_CHANGED, ""},
+   {SIG_DRAG_START, ""},
+   {SIG_DRAG_STOP, ""},
+   {NULL, NULL}
 };
 
+EVAS_SMART_SUBCLASS_NEW
+  (ELM_SLIDER_SMART_NAME, _elm_slider, Elm_Slider_Smart_Class,
+  Elm_Layout_Smart_Class, elm_layout_smart_class_get, _smart_callbacks);
+
 static Eina_Bool
-_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info)
+_delay_change(void *data)
 {
-   Evas_Event_Mouse_Wheel *mev;
-   Evas_Event_Key_Down *ev;
-   Widget_Data *wd;
+   ELM_SLIDER_DATA_GET(data, sd);
 
-   wd = elm_widget_data_get(obj);
-   if (!wd) return EINA_FALSE;
+   sd->delay = NULL;
+   evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
 
-   if (type == EVAS_CALLBACK_KEY_DOWN) goto key_down;
-   else if (type != EVAS_CALLBACK_MOUSE_WHEEL) return EINA_FALSE;
+   return ECORE_CALLBACK_CANCEL;
+}
 
-   mev = event_info;
-   if (mev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
-   if (elm_widget_disabled_get(obj)) return EINA_FALSE;
+static void _access_val(Evas_Object *obj, Eina_Strbuf *buf)
+{
 
-   if (mev->z < 0) _drag_up(obj, NULL, NULL, NULL);
-   else _drag_down(obj, NULL, NULL, NULL);
-   mev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-   return EINA_TRUE;
+   ELM_SLIDER_DATA_GET(obj, sd);
+   char *str = NULL;
+   char text[1024] = {0,};
+   char max_text[1024] = {0,};
+   double per;
 
-  key_down:
-   ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
-   if (elm_widget_disabled_get(obj)) return EINA_FALSE;
-   if ((!strcmp(ev->keyname, "Left")) ||
-       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+   if (sd->indicator_format_func)
      {
-        if (!wd->horizontal) return EINA_FALSE;
-        if (!wd->inverted) _drag_down(obj, NULL, NULL, NULL);
-        else _drag_up(obj, NULL, NULL, NULL);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-        return EINA_TRUE;
+#ifdef ELM_FEATURE_WEARABLE
+        eina_strbuf_append_printf(buf, E_("IDS_ST_BODY_P1SD_OF_P2SD_TTS"), (int)sd->val, (int)sd->val_max);
+#else
+        str = sd->indicator_format_func(sd->val);
+        eina_strbuf_append(buf, str);
+        if (sd->indicator_format_free) sd->indicator_format_free(str);
+        eina_strbuf_append(buf, E_(" of "));
+        str = sd->indicator_format_func(sd->val_max);
+        eina_strbuf_append(buf, str);
+        if (sd->indicator_format_free) sd->indicator_format_free(str);
+#endif
      }
-   else if ((!strcmp(ev->keyname, "Right")) ||
-            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+   else if (sd->indicator)
      {
-        if (!wd->horizontal) return EINA_FALSE;
-        if (!wd->inverted) _drag_up(obj, NULL, NULL, NULL);
-        else _drag_down(obj, NULL, NULL, NULL);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-        return EINA_TRUE;
+#ifdef ELM_FEATURE_WEARABLE
+        eina_strbuf_append_printf(buf, E_("IDS_ST_BODY_P1SD_OF_P2SD_TTS"), (int)sd->val, (int)sd->val_max);
+#else
+        snprintf(text, sizeof(text), sd->indicator, sd->val);
+        eina_strbuf_append(buf, text);
+        eina_strbuf_append(buf, E_(" of "));
+        snprintf(max_text, sizeof(max_text), sd->indicator, sd->val_max);
+        eina_strbuf_append(buf, text);
+        eina_strbuf_append_printf(buf, E_("IDS_ST_BODY_P1SD_OF_P2SD_TTS"), text, max_text);
+#endif
      }
-   else if ((!strcmp(ev->keyname, "Up")) ||
-            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+   else
      {
-        if (wd->horizontal) return EINA_FALSE;
-        if (wd->inverted) _drag_up(obj, NULL, NULL, NULL);
-        else _drag_down(obj, NULL, NULL, NULL);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-        return EINA_TRUE;
+        per = ((sd->val - sd->val_min) / (sd->val_max - sd->val_min)) * 100;
+#ifdef ELM_FEATURE_WEARABLE
+        eina_strbuf_append_printf(buf, E_("IDS_ST_BODY_P1SD_OF_P2SD_TTS"), (int)round(per), 100);
+#else
+        eina_strbuf_append_printf(buf, "%d %s 100", (int)round(per), E_(" of "));
+#endif
      }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+}
+static void
+_val_fetch(Evas_Object *obj)
+{
+   Eina_Bool rtl;
+   double posx = 0.0, posy = 0.0, pos = 0.0, val;
+   Eina_Strbuf *buf = NULL;
+
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   edje_object_part_drag_value_get
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider", &posx, &posy);
+   if (sd->horizontal) pos = posx;
+   else pos = posy;
+
+   rtl = elm_widget_mirrored_get(obj);
+   if ((!rtl && sd->inverted) ||
+       (rtl && ((!sd->horizontal && sd->inverted) ||
+                (sd->horizontal && !sd->inverted))))
+     pos = 1.0 - pos;
+
+   val = (pos * (sd->val_max - sd->val_min)) + sd->val_min;
+   if ((float)val != (float)sd->val)
      {
-        if (wd->horizontal) return EINA_FALSE;
-        if (wd->inverted) _drag_down(obj, NULL, NULL, NULL);
-        else _drag_up(obj, NULL, NULL, NULL);
-        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-        return EINA_TRUE;
+        sd->val = val;
+        evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+        if (sd->delay) ecore_timer_del(sd->delay);
+        sd->delay = ecore_timer_add(0.2, _delay_change, obj);
+
+        if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
+          {
+             buf = eina_strbuf_new();
+             _access_val(obj, buf);
+             _elm_access_say(obj, eina_strbuf_string_get(buf), EINA_FALSE);
+             eina_strbuf_free(buf);
+          }
      }
-   else return EINA_FALSE;
 }
 
 static void
-_del_hook(Evas_Object *obj)
+_val_set(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->labels) eina_hash_free(wd->labels);
-   if (wd->indicator) eina_stringshare_del(wd->units);
-   if (wd->delay) ecore_timer_del(wd->delay);
-   free(wd);
+   Eina_Bool rtl;
+   double pos;
+
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->val_max > sd->val_min)
+     pos = (sd->val - sd->val_min) / (sd->val_max - sd->val_min);
+   else pos = 0.0;
+
+   if (pos < 0.0) pos = 0.0;
+   else if (pos > 1.0)
+     pos = 1.0;
+
+   rtl = elm_widget_mirrored_get(obj);
+   if ((!rtl && sd->inverted) ||
+       (rtl && ((!sd->horizontal && sd->inverted) ||
+                (sd->horizontal && !sd->inverted))))
+     pos = 1.0 - pos;
+
+   edje_object_part_drag_value_set
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider", pos, pos);
 }
 
 static void
-_on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
+_units_set(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (elm_widget_focus_get(obj))
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->units_format_func)
      {
-        edje_object_signal_emit(wd->slider, "elm,action,focus", "elm");
-        evas_object_focus_set(wd->slider, EINA_TRUE);
+        char *buf;
+
+        buf = sd->units_format_func(sd->val);
+        elm_layout_text_set(obj, "elm.units", buf);
+
+        if (sd->units_format_free) sd->units_format_free(buf);
      }
-   else
+   else if (sd->units)
      {
-        edje_object_signal_emit(wd->slider, "elm,action,unfocus", "elm");
-        evas_object_focus_set(wd->slider, EINA_FALSE);
+        char buf[1024];
+
+        snprintf(buf, sizeof(buf), sd->units, sd->val);
+        elm_layout_text_set(obj, "elm.units", buf);
      }
+   else elm_layout_text_set(obj, "elm.units", NULL);
 }
 
 static void
-_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   edje_object_mirrored_set(wd->slider, rtl);
-}
-
-static Eina_Bool
-_labels_foreach_text_set(const Eina_Hash *hash __UNUSED__, const void *key, void *data, void *fdata)
+_indicator_set(Evas_Object *obj)
 {
-  Widget_Data *wd = fdata;
+   ELM_SLIDER_DATA_GET(obj, sd);
 
-  edje_object_part_text_escaped_set(wd->slider, key, data);
+   if (sd->indicator_format_func)
+     {
+        char *buf;
 
-  return 1;
-}
+        buf = sd->indicator_format_func(sd->val);
+        elm_layout_text_set(obj, "elm.indicator", buf);
+        elm_layout_text_set(obj, "elm.dragable.slider:elm.indicator", buf);
+        if (sd->popup)
+          edje_object_part_text_set(sd->popup, "elm.indicator", buf);
 
-static void
-_theme_hook(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   _elm_widget_mirrored_reload(obj);
-   _mirrored_set(obj, elm_widget_mirrored_get(obj));
-   if (wd->horizontal)
-     _elm_theme_object_set(obj, wd->slider, "slider", "horizontal", elm_widget_style_get(obj));
-   else
-     _elm_theme_object_set(obj, wd->slider, "slider", "vertical", elm_widget_style_get(obj));
-   if (elm_widget_disabled_get(obj))
-     edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm");
-   else
-     edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm");
-   if (wd->icon)
+        if (sd->indicator_format_free) sd->indicator_format_free(buf);
+     }
+   else if (sd->indicator)
      {
-        edje_object_part_swallow(wd->slider, "elm.swallow.content", wd->icon);
-        edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm");
+        char buf[1024];
+
+        snprintf(buf, sizeof(buf), sd->indicator, sd->val);
+        elm_layout_text_set(obj, "elm.indicator", buf);
+        elm_layout_text_set(obj, "elm.dragable.slider:elm.indicator", buf);
+        if (sd->popup)
+          edje_object_part_text_set(sd->popup, "elm.indicator", buf);
      }
-   if (wd->end)
-     edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm");
    else
-     edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");
-   if (wd->labels)
      {
-        eina_hash_foreach(wd->labels, _labels_foreach_text_set, wd);
-       edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
+        elm_layout_text_set(obj, "elm.indicator", NULL);
+        elm_layout_text_set(obj, "elm.dragable.slider:elm.indicator", NULL);
+        if (sd->popup)
+          edje_object_part_text_set(sd->popup, "elm.indicator", NULL);
      }
-
-   if (wd->units)
-     edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm");
-
-   if (wd->horizontal)
-     evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1);
-   else
-     evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale);
-
-   if (wd->inverted)
-     edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm");
-
-   edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
-   _units_set(obj);
-   _indicator_set(obj);
-   edje_object_message_signal_process(wd->slider);
-   edje_object_scale_set(wd->slider, elm_widget_scale_get(obj) * _elm_config->scale);
-   _val_set(obj);
-   _sizing_eval(obj);
 }
 
 static void
-_disable_hook(Evas_Object *obj)
+_slider_update(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (elm_widget_disabled_get(obj))
-     edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm");
-   else
-     edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm");
+   evas_object_smart_changed(obj);
 }
 
 static void
-_sizing_eval(Evas_Object *obj)
+_drag(void *data,
+      Evas_Object *obj __UNUSED__,
+      const char *emission __UNUSED__,
+      const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
-   if (!wd) return;
-   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   edje_object_size_min_restricted_calc(wd->slider, &minw, &minh, minw, minh);
-   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
-   evas_object_size_hint_min_set(obj, minw, minh);
-   evas_object_size_hint_max_set(obj, maxw, maxh);
+   _slider_update(data);
 }
 
 static void
-_changed_size_hints(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_drag_start(void *data,
+            Evas_Object *obj __UNUSED__,
+            const char *emission __UNUSED__,
+            const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return;
-   if ((obj != wd->icon) && (obj != wd->end)) return;
-   _sizing_eval(data);
+   _slider_update(data);
+   evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+   elm_widget_scroll_freeze_push(data);
 }
 
 static void
-_sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info)
+_drag_stop(void *data,
+           Evas_Object *obj __UNUSED__,
+           const char *emission __UNUSED__,
+           const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *sub = event_info;
-   if (!wd) return;
-   if (sub == wd->icon)
-     {
-        edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
-        evas_object_event_callback_del_full
-           (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
-        wd->icon = NULL;
-        edje_object_message_signal_process(wd->slider);
-        _sizing_eval(obj);
-     }
-   if (sub == wd->end)
-     {
-        edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");
-        evas_object_event_callback_del_full(sub,
-                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                            _changed_size_hints, obj);
-        wd->end = NULL;
-        edje_object_message_signal_process(wd->slider);
-        _sizing_eval(obj);
-     }
+   _slider_update(data);
+   evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+   elm_widget_scroll_freeze_pop(data);
 }
 
-static Eina_Bool
-_delay_change(void *data)
+static void
+_drag_step(void *data,
+           Evas_Object *obj __UNUSED__,
+           const char *emission __UNUSED__,
+           const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd) return ECORE_CALLBACK_CANCEL;
-   wd->delay = NULL;
-   evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
-   return ECORE_CALLBACK_CANCEL;
+   _slider_update(data);
 }
 
 static void
-_val_fetch(Evas_Object *obj)
+_drag_up(void *data,
+         Evas_Object *obj __UNUSED__,
+         const char *emission __UNUSED__,
+         const char *source __UNUSED__)
 {
-   Eina_Bool rtl;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   double posx = 0.0, posy = 0.0, pos = 0.0, val;
-   if (!wd) return;
-   edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider",
-                                   &posx, &posy);
-   if (wd->horizontal) pos = posx;
-   else pos = posy;
+   double step;
 
-   rtl = elm_widget_mirrored_get(obj);
-   if ((!rtl && wd->inverted) || (rtl &&
-                                  ((!wd->horizontal && wd->inverted) ||
-                                   (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
-   val = (pos * (wd->val_max - wd->val_min)) + wd->val_min;
-   if (val != wd->val)
-     {
-        wd->val = val;
-        evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
-        if (wd->delay) ecore_timer_del(wd->delay);
-        wd->delay = ecore_timer_add(0.2, _delay_change, obj);
-     }
+   ELM_SLIDER_DATA_GET(data, sd);
+   step = sd->step;
+
+   if (sd->inverted) step *= -1.0;
+
+   edje_object_part_drag_step
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider", step, step);
 }
 
 static void
-_val_set(Evas_Object *obj)
+_drag_down(void *data,
+           Evas_Object *obj __UNUSED__,
+           const char *emission __UNUSED__,
+           const char *source __UNUSED__)
 {
-   Eina_Bool rtl;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   double pos;
-   if (!wd) return;
-   if (wd->val_max > wd->val_min)
-     pos = (wd->val - wd->val_min) / (wd->val_max - wd->val_min);
-   else
-     pos = 0.0;
-   if (pos < 0.0) pos = 0.0;
-   else if (pos > 1.0) pos = 1.0;
+   double step;
 
-   rtl = elm_widget_mirrored_get(obj);
-   if ((!rtl && wd->inverted) || (rtl &&
-                                  ((!wd->horizontal && wd->inverted) ||
-                                   (wd->horizontal && !wd->inverted)))) pos = 1.0 - pos;
-   edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", pos, pos);
+   ELM_SLIDER_DATA_GET(data, sd);
+   step = -sd->step;
+
+   if (sd->inverted) step *= -1.0;
+
+   edje_object_part_drag_step
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider", step, step);
 }
 
 static void
-_units_set(Evas_Object *obj)
+_popup_show(void *data,
+            Evas_Object *obj __UNUSED__,
+            const char *emission __UNUSED__,
+            const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->units_format_func)
+   ELM_SLIDER_DATA_GET(data, sd);
+   if (sd->popup)
      {
-        char *buf;
-        buf = wd->units_format_func(wd->val);
-        edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
-        if (wd->units_format_free) wd->units_format_free(buf);
-     }
-   else if (wd->units)
-     {
-        char buf[1024];
-
-        snprintf(buf, sizeof(buf), wd->units, wd->val);
-        edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
+        evas_object_layer_set(sd->popup, evas_object_layer_get(data));
+        evas_object_raise(sd->popup);
+        evas_object_show(sd->popup);
+        edje_object_signal_emit(sd->popup, "popup,show", "elm");
      }
-   else
-     edje_object_part_text_escaped_set(wd->slider, "elm.units", NULL);
 }
 
 static void
-_indicator_set(Evas_Object *obj)
+_popup_hide(void *data,
+            Evas_Object *obj __UNUSED__,
+            const char *emission __UNUSED__,
+            const char *source __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->indicator_format_func)
+   ELM_SLIDER_DATA_GET(data, sd);
+   if (sd->popup)
      {
-        char *buf;
-        buf = wd->indicator_format_func(wd->val);
-        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
-        if (wd->indicator_format_free) wd->indicator_format_free(buf);
+        if (!sd->popup_hiding)
+          {
+             edje_object_signal_emit(sd->popup, "popup,hide", "elm");
+             sd->popup_hiding = EINA_TRUE;
+          }
      }
-   else if (wd->indicator)
+}
+
+static void
+_popup_hide_done(void *data,
+                 Evas_Object *obj __UNUSED__,
+                 const char *emission __UNUSED__,
+                 const char *source __UNUSED__)
+{
+   ELM_SLIDER_DATA_GET(data, sd);
+   if (sd->popup)
      {
-        char buf[1024];
-        snprintf(buf, sizeof(buf), wd->indicator, wd->val);
-        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+        if (sd->popup_hiding)
+          {
+             evas_object_hide(sd->popup);
+             sd->popup_hiding = EINA_FALSE;
+          }
      }
-   else
-     edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
 }
 
 static void
-_drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_popup_emit(void *data,
+            Evas_Object *obj __UNUSED__,
+            const char *emission,
+            const char *source)
 {
-   Widget_Data *wd = elm_widget_data_get((Evas_Object*)data);
-   if (elm_widget_disabled_get(data)) return;
-   _val_fetch(data);
-   _units_set(data);
-   _indicator_set(data);
-   edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-   edje_object_message_signal_process(wd->slider);
+   ELM_SLIDER_DATA_GET(data, sd);
+   if (sd->popup)
+     {
+        edje_object_signal_emit(sd->popup, emission, source);
+     }
 }
 
-static void
-_drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+static Eina_Bool
+_elm_slider_smart_event(Evas_Object *obj,
+                        Evas_Object *src __UNUSED__,
+                        Evas_Callback_Type type,
+                        void *event_info)
 {
-   Widget_Data *wd = elm_widget_data_get((Evas_Object*)data);
-   if (elm_widget_disabled_get(data)) return;
-   _val_fetch(data);
-   evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
-   _units_set(data);
-   _indicator_set(data);
-   elm_widget_scroll_freeze_push(data);
-   edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-   edje_object_message_signal_process(wd->slider);
+   Evas_Event_Mouse_Wheel *mev;
+   Evas_Event_Key_Down *ev;
+
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   // TIZEN ONLY(20131221) : When access mode, focused ui is disabled.
+   if (_elm_config->access_mode) return EINA_FALSE;
+
+   if (elm_widget_disabled_get(obj)) return EINA_FALSE;
+
+   if (type == EVAS_CALLBACK_KEY_DOWN) goto key_down;
+   else if (type != EVAS_CALLBACK_MOUSE_WHEEL)
+     return EINA_FALSE;
+
+   mev = event_info;
+   if (mev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
+
+   if (mev->z < 0) _drag_up(obj, NULL, NULL, NULL);
+   else _drag_down(obj, NULL, NULL, NULL);
+   mev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+
+   goto success;
+
+key_down:
+   ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
+   if (elm_widget_disabled_get(obj)) return EINA_FALSE;
+   if ((!strcmp(ev->keyname, "Left")) ||
+       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
+     {
+        if (!sd->horizontal) return EINA_FALSE;
+        if (!sd->inverted) _drag_down(obj, NULL, NULL, NULL);
+        else _drag_up(obj, NULL, NULL, NULL);
+        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+        goto success;
+     }
+   else if ((!strcmp(ev->keyname, "Right")) ||
+            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
+     {
+        if (!sd->horizontal) return EINA_FALSE;
+        if (!sd->inverted) _drag_up(obj, NULL, NULL, NULL);
+        else _drag_down(obj, NULL, NULL, NULL);
+        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+        goto success;
+     }
+   else if ((!strcmp(ev->keyname, "Up")) ||
+            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
+     {
+        if (sd->horizontal) return EINA_FALSE;
+        if (sd->inverted) _drag_up(obj, NULL, NULL, NULL);
+        else _drag_down(obj, NULL, NULL, NULL);
+        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+        goto success;
+     }
+   else if ((!strcmp(ev->keyname, "Down")) ||
+            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
+     {
+        if (sd->horizontal) return EINA_FALSE;
+        if (sd->inverted) _drag_down(obj, NULL, NULL, NULL);
+        else _drag_up(obj, NULL, NULL, NULL);
+        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+        goto success;
+     }
+   else return EINA_FALSE;
+
+success:
+   _slider_update(obj);
+
+   return EINA_TRUE;
 }
 
-static void
-_drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+static Eina_Bool
+_elm_slider_smart_activate(Evas_Object *obj, Elm_Activate act)
 {
-   if (elm_widget_disabled_get(data)) return;
-   _val_fetch(data);
-   evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
-   _units_set(data);
-   _indicator_set(data);
-   elm_widget_scroll_freeze_pop(data);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if ((elm_widget_disabled_get(obj)) ||
+       (act == ELM_ACTIVATE_DEFAULT)) return EINA_FALSE;
+
+   if ((act == ELM_ACTIVATE_UP) ||
+       (act == ELM_ACTIVATE_RIGHT))
+     {
+        if ((!sd->horizontal && sd->inverted) ||
+            (sd->horizontal && !sd->inverted))
+          _drag_up(obj, NULL, NULL, NULL);
+        else
+          _drag_down(obj, NULL, NULL, NULL);
+     }
+   else if ((act == ELM_ACTIVATE_DOWN) ||
+            (act == ELM_ACTIVATE_LEFT))
+     {
+        if ((!sd->horizontal && sd->inverted) ||
+            (sd->horizontal && !sd->inverted))
+          _drag_down(obj, NULL, NULL, NULL);
+        else
+          _drag_up(obj, NULL, NULL, NULL);
+     }
+
+   _slider_update(obj);
+
+   return EINA_TRUE;
 }
 
 static void
-_drag_step(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_visuals_refresh(Evas_Object *obj)
 {
-   if (elm_widget_disabled_get(data)) return;
-   _val_fetch(data);
-   _units_set(data);
-   _indicator_set(data);
+   _val_set(obj);
+   evas_object_smart_changed(obj);
 }
 
-static void
-_drag_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+static Eina_Bool
+_elm_slider_smart_theme(Evas_Object *obj)
 {
-   double step;
-   Widget_Data *wd;
-   if (elm_widget_disabled_get(data)) return;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->horizontal)
+     {
+        eina_stringshare_replace(&ELM_LAYOUT_DATA(sd)->group, "horizontal");
+        if (sd->popup)
+          _elm_theme_set(NULL, sd->popup,
+                         "slider", "horizontal/popup",
+                         elm_widget_style_get(obj));
+     }
+   else
+     {
+        eina_stringshare_replace(&ELM_LAYOUT_DATA(sd)->group, "vertical");
+        if (sd->popup)
+          _elm_theme_set(NULL, sd->popup,
+                         "slider", "vertical/popup",
+                         elm_widget_style_get(obj));
+     }
+
+   if (!ELM_WIDGET_CLASS(_elm_slider_parent_sc)->theme(obj)) return EINA_FALSE;
+
+   if (sd->popup)
+     edje_object_scale_set(sd->popup, elm_widget_scale_get(obj) *
+                           elm_config_scale_get());
+
+   if (sd->units)
+     elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+
+   if (sd->horizontal)
+     evas_object_size_hint_min_set
+       (sd->spacer, (double)sd->size * elm_widget_scale_get(obj) *
+       elm_config_scale_get(), 1);
+   else
+     evas_object_size_hint_min_set
+       (sd->spacer, 1, (double)sd->size * elm_widget_scale_get(obj) *
+       elm_config_scale_get());
+
+   if (sd->inverted)
+     {
+        elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,inverted,on", "elm");
+     }
+
+   if (elm_object_disabled_get(obj))
+     elm_layout_signal_emit(obj, "elm,state,disabled", "elm");
+
+   _visuals_refresh(obj);
 
-   wd = elm_widget_data_get(data);
-   step = 0.05;
+   edje_object_message_signal_process(ELM_WIDGET_DATA(sd)->resize_obj);
+   if (sd->popup)
+     edje_object_message_signal_process(sd->popup);
 
-   if (wd->inverted) step *= ELM_SLIDER_INVERTED_FACTOR;
+   evas_object_smart_changed(obj);
 
-   edje_object_part_drag_step(wd->slider, "elm.dragable.slider", step, step);
+   return EINA_TRUE;
 }
 
 static void
-_drag_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
+_elm_slider_smart_sizing_eval(Evas_Object *obj)
 {
-   double step;
-   Widget_Data *wd;
-   if (elm_widget_disabled_get(data)) return;
+   ELM_SLIDER_DATA_GET(obj, sd);
 
-   wd = elm_widget_data_get(data);
-   step = -0.05;
-
-   if (wd->inverted) step *= ELM_SLIDER_INVERTED_FACTOR;
+   Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
 
-   edje_object_part_drag_step(wd->slider, "elm.dragable.slider", step, step);
+   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+   edje_object_size_min_restricted_calc
+     (ELM_WIDGET_DATA(sd)->resize_obj, &minw, &minh, minw, minh);
+   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+   evas_object_size_hint_min_set(obj, minw, minh);
+   evas_object_size_hint_max_set(obj, maxw, maxh);
 }
 
 static void
-_spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_spacer_down_cb(void *data,
+                Evas *e __UNUSED__,
+                Evas_Object *obj __UNUSED__,
+                void *event_info)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
+   ELM_SLIDER_DATA_GET(data, sd);
+
    Evas_Event_Mouse_Down *ev = event_info;
    Evas_Coord x, y, w, h;
    double button_x = 0.0, button_y = 0.0;
-   if (elm_widget_disabled_get(data)) return;
-
-   wd->spacer_down = EINA_TRUE;
-   wd->val2 = wd->val;
-   evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
-   wd->downx = ev->canvas.x - x;
-   wd->downy = ev->canvas.y - y;
-   edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", &button_x, &button_y);
-   if (wd->horizontal)
+
+   sd->spacer_down = EINA_TRUE;
+   sd->val2 = sd->val;
+   evas_object_geometry_get(sd->spacer, &x, &y, &w, &h);
+   sd->downx = ev->canvas.x - x;
+   sd->downy = ev->canvas.y - y;
+   if (sd->horizontal)
      {
         button_x = ((double)ev->canvas.x - (double)x) / (double)w;
         if (button_x > 1) button_x = 1;
@@ -495,59 +578,57 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
         if (button_y > 1) button_y = 1;
         if (button_y < 0) button_y = 0;
      }
-   edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y);
-   _val_fetch(data);
-   evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
-   _units_set(data);
-   _indicator_set(data);
-   edje_object_signal_emit(wd->slider, "elm,state,indicator,show", "elm");
-   edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-   edje_object_message_signal_process(wd->slider);
 }
 
 static void
-_spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+_spacer_move_cb(void *data,
+                Evas *e __UNUSED__,
+                Evas_Object *obj __UNUSED__,
+                void *event_info)
 {
-   Widget_Data *wd = elm_widget_data_get(data);
-   Evas_Event_Mouse_Move *ev = event_info;
+   ELM_SLIDER_DATA_GET(data, sd);
+
    Evas_Coord x, y, w, h;
    double button_x = 0.0, button_y = 0.0;
-   if (elm_widget_disabled_get(data)) return;
+   Evas_Event_Mouse_Move *ev = event_info;
+   int cur_thumbscroll = 0;
+   int drag_gap = 0;
 
-   if  (wd->spacer_down)
+   if (!sd->spacer_down) return;
+
+   x = y = w = h = -1;
+   evas_object_geometry_get(sd->spacer, &x, &y, &w, &h);
+
+   if (sd->horizontal)
      {
-        Evas_Coord d = 0;
+        cur_thumbscroll = abs(ev->cur.canvas.y - y - sd->downy);
+        drag_gap = abs(ev->cur.canvas.x - x - sd->downx);
+     }
+   else
+     {
+        cur_thumbscroll = abs(ev->cur.canvas.x - x - sd->downx);
+        drag_gap = abs(ev->cur.canvas.y - y - sd->downy);
+     }
 
-        evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
-        if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx);
-        else d = abs(ev->cur.canvas.y - y - wd->downy);
-        if (d > (_elm_config->thumbscroll_threshold - 1))
-          {
-             if (!wd->frozen)
-               {
-                  elm_widget_scroll_freeze_push(data);
-                  wd->frozen = EINA_TRUE;
-               }
-             ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
-          }
+   if (!sd->spacer_dragging_start &&
+       (cur_thumbscroll > (_elm_config->thumbscroll_threshold - 1)))
+     {
+        sd->spacer_down = EINA_FALSE;
+     }
 
-        if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
+   if (sd->spacer_dragging_start ||
+       (drag_gap > elm_config_finger_size_get() * 0.5))
+     {
+        sd->spacer_dragging_start = EINA_TRUE;
+        if (!sd->frozen)
           {
-             if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
-             _val_fetch(data);
-             evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
-             _units_set(data);
-             _indicator_set(data);
-             if (wd->frozen)
-               {
-                  elm_widget_scroll_freeze_pop(data);
-                  wd->frozen = EINA_FALSE;
-               }
-             edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
-             elm_slider_value_set(data, wd->val2);
-             return;
+             elm_widget_scroll_freeze_push(data);
+             sd->frozen = EINA_TRUE;
+             ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
+             evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+             elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
           }
-        if (wd->horizontal)
+        if (sd->horizontal)
           {
              button_x = ((double)ev->cur.canvas.x - (double)x) / (double)w;
              if (button_x > 1) button_x = 1;
@@ -559,540 +640,627 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
              if (button_y > 1) button_y = 1;
              if (button_y < 0) button_y = 0;
           }
-        edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", button_x, button_y);
-        _val_fetch(data);
-        _units_set(data);
-        _indicator_set(data);
-        edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-        edje_object_message_signal_process(wd->slider);
-     }
-}
 
-static void
-_spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   Widget_Data *wd = elm_widget_data_get(data);
-   if (elm_widget_disabled_get(data)) return;
-   if (!wd->spacer_down) return;
+        edje_object_part_drag_value_set
+          (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider",
+           button_x, button_y);
 
-   wd->spacer_down = EINA_FALSE;
-   _val_fetch(data);
-   evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
-   _units_set(data);
-   _indicator_set(data);
-   if (wd->frozen)
-     {
-        elm_widget_scroll_freeze_pop(data);
-        wd->frozen = EINA_FALSE;
+        _slider_update(data);
      }
-   edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
 }
 
 static void
-_elm_slider_label_set(Evas_Object *obj, const char *part, const char *label)
+_spacer_up_cb(void *data,
+              Evas *e __UNUSED__,
+              Evas_Object *obj __UNUSED__,
+              void *event_info)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   const char* default_part = "elm.text";
-   const char* real_part;
-
-   if (!wd) return;
-
-   if (!part)
-     real_part = default_part;
-   else
-     real_part = part;
+   ELM_SLIDER_DATA_GET(data, sd);
+   Evas_Event_Mouse_Up *ev = event_info;
+   Evas_Coord x, y, w, h;
+   double button_x = 0.0, button_y = 0.0;
 
-   if (wd->labels)
-     {
-       const char* old_label;
-
-       old_label = eina_hash_find(wd->labels, real_part);
-       if (!old_label)
-          eina_hash_add(wd->labels, real_part, eina_stringshare_add(label));
-       else
-        {
-          eina_stringshare_ref(old_label);
-          eina_hash_modify(wd->labels, real_part, eina_stringshare_add(label));
-          eina_stringshare_del(old_label);
-        }
-     }
+   if (!sd->spacer_down) return;
+   if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
+   if (sd->spacer_dragging_start)
+     sd->spacer_dragging_start = EINA_FALSE;
 
-   if (label)
+   evas_object_geometry_get(sd->spacer, &x, &y, &w, &h);
+   if (sd->horizontal)
      {
-        edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
-        edje_object_message_signal_process(wd->slider);
+        button_x = ((double)ev->canvas.x - (double)x) / (double)w;
+        if (button_x > 1) button_x = 1;
+        if (button_x < 0) button_x = 0;
      }
    else
      {
-        edje_object_signal_emit(wd->slider, "elm,state,text,hidden", "elm");
-        edje_object_message_signal_process(wd->slider);
+        button_y = ((double)ev->canvas.y - (double)y) / (double)h;
+        if (button_y > 1) button_y = 1;
+        if (button_y < 0) button_y = 0;
      }
+   edje_object_part_drag_value_set
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider",
+      button_x, button_y);
+   _slider_update(data);
 
-   edje_object_part_text_escaped_set(wd->slider, real_part, label);
-   _sizing_eval(obj);
+   if (sd->frozen)
+     {
+        elm_widget_scroll_freeze_pop(data);
+        sd->frozen = EINA_FALSE;
+        evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+        elm_layout_signal_emit(data, "elm,state,indicator,hide", "elm");
+     }
 }
 
-static const char *
-_elm_slider_label_get(const Evas_Object *obj, const char *part)
+static void
+_track_move_cb(void *data,
+               Evas *e __UNUSED__,
+               Evas_Object *obj,
+               void *event_info __UNUSED__)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!wd->labels) return NULL;
-
-   if (!part)
-     return eina_hash_find(wd->labels, "elm.text");
-   return eina_hash_find(wd->labels, part);
+   Evas_Coord x, y;
+
+   ELM_SLIDER_DATA_GET(data, sd);
+   evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+   evas_object_move(sd->popup, x, y);
 }
 
 static void
-_icon_set(Evas_Object *obj, Evas_Object *icon)
+_track_resize_cb(void *data,
+                 Evas *e __UNUSED__,
+                 Evas_Object *obj,
+                 void *event_info __UNUSED__)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->icon == icon) return;
-   if (wd->icon) evas_object_del(wd->icon);
-   wd->icon = icon;
-   if (icon)
-     {
-        elm_widget_sub_object_add(obj, icon);
-        evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                       _changed_size_hints, obj);
-        edje_object_part_swallow(wd->slider, "elm.swallow.icon", icon);
-        edje_object_signal_emit(wd->slider, "elm,state,icon,visible", "elm");
-        edje_object_message_signal_process(wd->slider);
-     }
-   _sizing_eval(obj);
-}
+   Evas_Coord w, h;
 
-static Evas_Object *
-_icon_unset(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *ret = NULL;
-   if (!wd) return NULL;
-   if (wd->icon)
-     {
-        elm_widget_sub_object_del(obj, wd->icon);
-        evas_object_event_callback_del_full(wd->icon,
-                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                            _changed_size_hints, obj);
-        ret = wd->icon;
-        edje_object_part_unswallow(wd->slider, wd->icon);
-        edje_object_signal_emit(wd->slider, "elm,state,icon,hidden", "elm");
-        wd->icon = NULL;
-        _sizing_eval(obj);
-     }
-   return ret;
+   ELM_SLIDER_DATA_GET(data, sd);
+   evas_object_geometry_get(obj, NULL, NULL, &w, &h);
+   evas_object_resize(sd->popup, w, h);
 }
 
 static void
-_end_set(Evas_Object *obj, Evas_Object *end)
+_min_max_set(Evas_Object *obj)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->end == end) return;
-   if (wd->end) evas_object_del(wd->end);
-   wd->end = end;
-   if (end)
+   char *buf_min = NULL;
+   char *buf_max = NULL;
+
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->units_format_func)
      {
-        elm_widget_sub_object_add(obj, end);
-        evas_object_event_callback_add(end, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                       _changed_size_hints, obj);
-        edje_object_part_swallow(wd->slider, "elm.swallow.end", end);
-        edje_object_signal_emit(wd->slider, "elm,state,end,visible", "elm");
-        edje_object_message_signal_process(wd->slider);
+        buf_min = sd->units_format_func(sd->val_min);
+        buf_max = sd->units_format_func(sd->val_max);
      }
-   _sizing_eval(obj);
-}
+   else if (sd->units)
+     {
+        int length = strlen(sd->units);
 
-static Evas_Object *
-_end_unset(Evas_Object *obj)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *ret = NULL;
-   if (!wd) return NULL;
-   if (wd->end)
+        buf_min = alloca(length + 128);
+        buf_max = alloca(length + 128);
+
+        snprintf((char *)buf_min, length + 128, sd->units, sd->val_min);
+        snprintf((char *)buf_max, length + 128, sd->units, sd->val_max);
+     }
+
+   elm_layout_text_set(obj, "elm.units.min", buf_min);
+   elm_layout_text_set(obj, "elm.units.max", buf_max);
+
+   if (sd->units_format_func && sd->units_format_free)
      {
-        elm_widget_sub_object_del(obj, wd->end);
-        evas_object_event_callback_del_full(wd->end,
-                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                            _changed_size_hints, obj);
-        ret = wd->end;
-        edje_object_part_unswallow(wd->slider, wd->end);
-        edje_object_signal_emit(wd->slider, "elm,state,end,hidden", "elm");
-        wd->end = NULL;
-        _sizing_eval(obj);
+        sd->units_format_free(buf_min);
+        sd->units_format_free(buf_max);
      }
-   return ret;
 }
 
 static void
-_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+_elm_slider_smart_calculate(Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   if (!part || !strcmp(part, "icon"))
-     _icon_set(obj, content);
-   else if (!strcmp(part, "end"))
-     _end_set(obj, content);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   elm_layout_freeze(obj);
+
+   if (sd->horizontal)
+     evas_object_size_hint_min_set
+       (sd->spacer, (double)sd->size * elm_widget_scale_get(obj) *
+       elm_config_scale_get(), 1);
+   else
+     evas_object_size_hint_min_set
+       (sd->spacer, 1, (double)sd->size * elm_widget_scale_get(obj) *
+       elm_config_scale_get());
+
+   _val_fetch(obj);
+   _units_set(obj);
+   _min_max_set(obj);
+   _indicator_set(obj);
+
+   elm_layout_thaw(obj);
 }
 
-static Evas_Object *
-_content_get_hook(const Evas_Object *obj, const char *part)
+static char *
+_access_info_cb(void *data __UNUSED__, Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd;
-   wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   if (!part || !strcmp(part, "icon"))
-     return wd->icon;
-   else if (!strcmp(part, "end"))
-     return wd->end;
+   const char *txt = elm_widget_access_info_get(obj);
+
+   if (!txt) txt = elm_layout_text_get(obj, NULL);
+   if (txt) return strdup(txt);
+
    return NULL;
 }
 
-static Evas_Object *
-_content_unset_hook(Evas_Object *obj, const char *part)
+static char *
+_access_state_cb(void *data __UNUSED__, Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   if (!part || !strcmp(part, "icon"))
-     return _icon_unset(obj);
-   else if (!strcmp(part, "end"))
-     return _end_unset(obj);
+   /* Tizen Only */
+   char *ret;
+   const char *txt;
+   Eina_Strbuf *buf = NULL;
+
+   buf = eina_strbuf_new();
+   _access_val(obj, buf);
+
+   txt = elm_layout_text_get(obj, "elm.units");
+   if (txt) eina_strbuf_append(buf, txt);
+
+   if (!elm_widget_disabled_get(obj))
+     {
+        eina_strbuf_append(buf, ", ");
+        eina_strbuf_append(buf, E_(" flick up and down to adjust the position"));
+     }
+
+   if (eina_strbuf_length_get(buf))
+     {
+        ret = eina_strbuf_string_steal(buf);
+        eina_strbuf_free(buf);
+        return ret;
+     }
+
+   eina_strbuf_free(buf);
    return NULL;
 }
 
 static void
-_hash_labels_free_cb(void* label)
+_elm_slider_smart_add(Evas_Object *obj)
 {
-  if (label)
-    eina_stringshare_del(label);
+   EVAS_SMART_DATA_ALLOC(obj, Elm_Slider_Smart_Data);
+
+   ELM_WIDGET_CLASS(_elm_slider_parent_sc)->base.add(obj);
 }
 
 static void
-_min_max_set(Evas_Object *obj)
+_elm_slider_smart_del(Evas_Object *obj)
 {
-   char *buf_min = NULL;
-   char *buf_max = NULL;
+   ELM_SLIDER_DATA_GET(obj, sd);
 
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->units_format_func)
-     {
-        buf_min = wd->units_format_func(wd->val_min);
-        buf_max = wd->units_format_func(wd->val_max);
-     }
-   else if (wd->units)
-     {
-        int length = strlen(wd->units);
+   // Because "drag,stop" edje signal is queued,
+   // It can be discarded after object is deletd.
+   if (0 != elm_widget_scroll_freeze_get(obj))
+     elm_widget_scroll_freeze_pop(obj);
 
-        buf_min = alloca(length + 128);
-        buf_max = alloca(length + 128);
+   if (sd->indicator) eina_stringshare_del(sd->indicator);
+   if (sd->units) eina_stringshare_del(sd->units);
+   if (sd->delay) ecore_timer_del(sd->delay);
 
-        snprintf((char*) buf_min, length + 128, wd->units, wd->val_min);
-        snprintf((char*) buf_max, length + 128, wd->units, wd->val_max);
-     }
+   if (sd->popup) evas_object_del(sd->popup);
 
-   edje_object_part_text_escaped_set(wd->slider, "elm.units.min", buf_min);
-   edje_object_part_text_escaped_set(wd->slider, "elm.units.max", buf_max);
+   ELM_WIDGET_CLASS(_elm_slider_parent_sc)->base.del(obj);
+}
 
-   if (wd->units_format_func && wd->units_format_free)
-     {
-        wd->units_format_free(buf_min);
-        wd->units_format_free(buf_max);
-     }
+static void
+_elm_slider_smart_set_user(Elm_Slider_Smart_Class *sc)
+{
+   ELM_WIDGET_CLASS(sc)->base.add = _elm_slider_smart_add;
+   ELM_WIDGET_CLASS(sc)->base.del = _elm_slider_smart_del;
+   ELM_WIDGET_CLASS(sc)->base.calculate = _elm_slider_smart_calculate;
+
+   ELM_WIDGET_CLASS(sc)->theme = _elm_slider_smart_theme;
+   ELM_WIDGET_CLASS(sc)->event = _elm_slider_smart_event;
+   ELM_WIDGET_CLASS(sc)->activate = _elm_slider_smart_activate;
+
+   /* not a 'focus chain manager' */
+   ELM_WIDGET_CLASS(sc)->focus_next = NULL;
+   ELM_WIDGET_CLASS(sc)->focus_direction_manager_is = NULL;
+   ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
+
+   ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_slider_smart_sizing_eval;
+
+   ELM_LAYOUT_CLASS(sc)->content_aliases = _content_aliases;
+   ELM_LAYOUT_CLASS(sc)->text_aliases = _text_aliases;
 }
 
+EAPI const Elm_Slider_Smart_Class *
+elm_slider_smart_class_get(void)
+{
+   static Elm_Slider_Smart_Class _sc =
+     ELM_SLIDER_SMART_CLASS_INIT_NAME_VERSION(ELM_SLIDER_SMART_NAME);
+   static const Elm_Slider_Smart_Class *class = NULL;
+   Evas_Smart_Class *esc = (Evas_Smart_Class *)&_sc;
+
+   if (class)
+     return class;
+
+   _elm_slider_smart_set(&_sc);
+   esc->callbacks = _smart_callbacks;
+   class = &_sc;
+
+   return class;
+}
 
 EAPI Evas_Object *
 elm_slider_add(Evas_Object *parent)
 {
    Evas_Object *obj;
-   Evas *e;
-   Widget_Data *wd;
-
-   ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
-
-   ELM_SET_WIDTYPE(widtype, "slider");
-   elm_widget_type_set(obj, "slider");
-   elm_widget_sub_object_add(parent, obj);
-   elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
-   elm_widget_data_set(obj, wd);
-   elm_widget_del_hook_set(obj, _del_hook);
-   elm_widget_theme_hook_set(obj, _theme_hook);
-   elm_widget_disable_hook_set(obj, _disable_hook);
+
+   EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
+
+   obj = elm_widget_add(_elm_slider_smart_class_new(), parent);
+   if (!obj) return NULL;
+
+   if (!elm_widget_sub_object_add(parent, obj))
+     ERR("could not add %p as sub object of %p", obj, parent);
+
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   sd->horizontal = EINA_TRUE;
+   sd->indicator_show = EINA_TRUE;
+   sd->val = 0.0;
+   sd->val_min = 0.0;
+   sd->val_max = 1.0;
+   sd->step = 0.05;
+
+   elm_layout_theme_set
+     (obj, "slider", "horizontal", elm_widget_style_get(obj));
+
+   elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj);
+   elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj);
+   elm_layout_signal_callback_add(obj, "drag,stop", "*", _drag_stop, obj);
+   elm_layout_signal_callback_add(obj, "drag,step", "*", _drag_step, obj);
+   elm_layout_signal_callback_add(obj, "drag,page", "*", _drag_stop, obj);
+   elm_layout_signal_callback_add(obj, "popup,show", "elm", _popup_show, obj);
+   elm_layout_signal_callback_add(obj, "popup,hide", "elm", _popup_hide, obj);
+   elm_layout_signal_callback_add(obj, "*", "popup,emit", _popup_emit, obj);
+   edje_object_part_drag_value_set
+     (ELM_WIDGET_DATA(sd)->resize_obj, "elm.dragable.slider", 0.0, 0.0);
+
+   sd->spacer = evas_object_rectangle_add(evas_object_evas_get(obj));
+   evas_object_color_set(sd->spacer, 0, 0, 0, 0);
+   evas_object_pass_events_set(sd->spacer, EINA_TRUE);
+   elm_layout_content_set(obj, "elm.swallow.bar", sd->spacer);
+
+   /* if theme has an overlayed slider mode, then lets support it */
+   if (edje_object_part_exists(elm_layout_edje_get(obj),
+                               "elm.track.slider"))
+     {
+        // XXX popup needs to adapt to theme etc.
+        sd->popup = edje_object_add(evas_object_evas_get(obj));
+        _elm_theme_set(NULL, sd->popup,
+                       "slider", "horizontal/popup",
+                       elm_widget_style_get(obj));
+        edje_object_scale_set(sd->popup, elm_widget_scale_get(obj) *
+                              elm_config_scale_get());
+        edje_object_signal_callback_add(sd->popup, "popup,hide,done", "elm",
+                                        _popup_hide_done, obj);
+
+        /* create a rectangle to track position+size of the dragable */
+        sd->track = evas_object_rectangle_add(evas_object_evas_get(obj));
+        evas_object_event_callback_add
+          (sd->track, EVAS_CALLBACK_MOVE, _track_move_cb, obj);
+        evas_object_event_callback_add
+          (sd->track, EVAS_CALLBACK_RESIZE, _track_resize_cb, obj);
+
+        evas_object_color_set(sd->track, 0, 0, 0, 0);
+        evas_object_pass_events_set(sd->track, EINA_TRUE);
+        elm_layout_content_set(obj, "elm.track.slider", sd->track);
+     }
+
+   evas_object_event_callback_add
+     (sd->spacer, EVAS_CALLBACK_MOUSE_DOWN, _spacer_down_cb, obj);
+   evas_object_event_callback_add
+     (sd->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
+   evas_object_event_callback_add
+     (sd->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
+
    elm_widget_can_focus_set(obj, EINA_TRUE);
-   elm_widget_event_hook_set(obj, _event_hook);
-   elm_widget_text_set_hook_set(obj, _elm_slider_label_set);
-   elm_widget_text_get_hook_set(obj, _elm_slider_label_get);
-   elm_widget_content_set_hook_set(obj, _content_set_hook);
-   elm_widget_content_get_hook_set(obj, _content_get_hook);
-   elm_widget_content_unset_hook_set(obj, _content_unset_hook);
-
-   wd->horizontal = EINA_TRUE;
-   wd->indicator_show = EINA_TRUE;
-   wd->val = 0.0;
-   wd->val_min = 0.0;
-   wd->val_max = 1.0;
-   wd->labels = eina_hash_string_superfast_new(_hash_labels_free_cb);
-
-   wd->slider = edje_object_add(e);
-   _elm_theme_object_set(obj, wd->slider, "slider", "horizontal", "default");
-   elm_widget_resize_object_set(obj, wd->slider);
-   edje_object_signal_callback_add(wd->slider, "drag", "*", _drag, obj);
-   edje_object_signal_callback_add(wd->slider, "drag,start", "*", _drag_start, obj);
-   edje_object_signal_callback_add(wd->slider, "drag,stop", "*", _drag_stop, obj);
-   edje_object_signal_callback_add(wd->slider, "drag,step", "*", _drag_step, obj);
-   edje_object_signal_callback_add(wd->slider, "drag,page", "*", _drag_stop, obj);
-   //   edje_object_signal_callback_add(wd->slider, "drag,set", "*", _drag_stop, obj);
-   edje_object_part_drag_value_set(wd->slider, "elm.dragable.slider", 0.0, 0.0);
-
-   wd->spacer = evas_object_rectangle_add(e);
-   evas_object_color_set(wd->spacer, 0, 0, 0, 0);
-   evas_object_pass_events_set(wd->spacer, EINA_TRUE);
-   elm_widget_sub_object_add(obj, wd->spacer);
-   edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
-   evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_DOWN, _spacer_down_cb, obj);
-   evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_MOVE, _spacer_move_cb, obj);
-   evas_object_event_callback_add(wd->spacer, EVAS_CALLBACK_MOUSE_UP, _spacer_up_cb, obj);
-   evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
-
-   _mirrored_set(obj, elm_widget_mirrored_get(obj));
-   _sizing_eval(obj);
-
-   // TODO: convert Elementary to subclassing of Evas_Smart_Class
-   // TODO: and save some bytes, making descriptions per-class and not instance!
-   evas_object_smart_callbacks_descriptions_set(obj, _signals);
+
+   _elm_access_object_register(obj, ELM_WIDGET_DATA(sd)->resize_obj);
+   _elm_access_text_set
+     (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("slider"));
+   _elm_access_callback_set
+     (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
+   _elm_access_callback_set
+     (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, sd);
+
+   evas_object_smart_changed(obj);
+
+   //Tizen Only: This should be removed when eo is applied.
+   ELM_WIDGET_DATA_GET(obj, wsd);
+   wsd->on_create = EINA_FALSE;
+
    return obj;
 }
 
 EAPI void
-elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
+elm_slider_span_size_set(Evas_Object *obj,
+                         Evas_Coord size)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->size == size) return;
-   wd->size = size;
-   if (wd->horizontal)
-     evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1);
-   else
-     evas_object_size_hint_min_set(wd->spacer, 1, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale);
-   if (wd->indicator_show)
-     edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->size == size) return;
+   sd->size = size;
+
+   if (sd->indicator_show)
+     {
+        elm_layout_signal_emit(obj, "elm,state,val,show", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm");
+     }
    else
-     edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
-   edje_object_part_swallow(wd->slider, "elm.swallow.bar", wd->spacer);
-   _sizing_eval(obj);
+     {
+        elm_layout_signal_emit(obj, "elm,state,val,hide", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm");
+     }
+
+   evas_object_smart_changed(obj);
 }
 
 EAPI Evas_Coord
 elm_slider_span_size_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0;
-   return wd->size;
+   ELM_SLIDER_CHECK(obj) 0;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->size;
 }
 
 EAPI void
-elm_slider_unit_format_set(Evas_Object *obj, const char *units)
+elm_slider_unit_format_set(Evas_Object *obj,
+                           const char *units)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   eina_stringshare_replace(&wd->units, units);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   eina_stringshare_replace(&sd->units, units);
    if (units)
      {
-        edje_object_signal_emit(wd->slider, "elm,state,units,visible", "elm");
-        edje_object_message_signal_process(wd->slider);
+        elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
+        edje_object_message_signal_process(ELM_WIDGET_DATA(sd)->resize_obj);
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,units,visible", "elm");
      }
    else
      {
-        edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm");
-        edje_object_message_signal_process(wd->slider);
+        elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm");
+        edje_object_message_signal_process(ELM_WIDGET_DATA(sd)->resize_obj);
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,units,hidden", "elm");
      }
-   _min_max_set(obj);
-   _units_set(obj);
-   _sizing_eval(obj);
+
+   evas_object_smart_changed(obj);
 }
 
 EAPI const char *
 elm_slider_unit_format_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   return wd->units;
+   ELM_SLIDER_CHECK(obj) NULL;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->units;
 }
 
 EAPI void
-elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator)
+elm_slider_indicator_format_set(Evas_Object *obj,
+                                const char *indicator)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   eina_stringshare_replace(&wd->indicator, indicator);
-   _indicator_set(obj);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   eina_stringshare_replace(&sd->indicator, indicator);
+   evas_object_smart_changed(obj);
 }
 
 EAPI const char *
 elm_slider_indicator_format_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return NULL;
-   return wd->indicator;
+   ELM_SLIDER_CHECK(obj) NULL;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->indicator;
 }
 
 EAPI void
-elm_slider_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
+elm_slider_horizontal_set(Evas_Object *obj,
+                          Eina_Bool horizontal)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
    horizontal = !!horizontal;
-   if (wd->horizontal == horizontal) return;
-   wd->horizontal = horizontal;
-   _theme_hook(obj);
+   if (sd->horizontal == horizontal) return;
+   sd->horizontal = horizontal;
+
+   ELM_WIDGET_DATA(sd)->api->theme(obj);
 }
 
 EAPI Eina_Bool
 elm_slider_horizontal_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return EINA_FALSE;
-   return wd->horizontal;
+   ELM_SLIDER_CHECK(obj) EINA_FALSE;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->horizontal;
 }
 
 EAPI void
-elm_slider_min_max_set(Evas_Object *obj, double min, double max)
+elm_slider_min_max_set(Evas_Object *obj,
+                       double min,
+                       double max)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if ((wd->val_min == min) && (wd->val_max == max)) return;
-   wd->val_min = min;
-   wd->val_max = max;
-   if (wd->val < wd->val_min) wd->val = wd->val_min;
-   if (wd->val > wd->val_max) wd->val = wd->val_max;
-   _min_max_set(obj);
-   _val_set(obj);
-   _units_set(obj);
-   _indicator_set(obj);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if ((sd->val_min == min) && (sd->val_max == max)) return;
+   sd->val_min = min;
+   sd->val_max = max;
+   if (sd->val < sd->val_min) sd->val = sd->val_min;
+   if (sd->val > sd->val_max) sd->val = sd->val_max;
+
+   _visuals_refresh(obj);
 }
 
 EAPI void
-elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
+elm_slider_min_max_get(const Evas_Object *obj,
+                       double *min,
+                       double *max)
 {
    if (min) *min = 0.0;
    if (max) *max = 0.0;
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (min) *min = wd->val_min;
-   if (max) *max = wd->val_max;
+
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (min) *min = sd->val_min;
+   if (max) *max = sd->val_max;
 }
 
 EAPI void
-elm_slider_value_set(Evas_Object *obj, double val)
+elm_slider_value_set(Evas_Object *obj,
+                     double val)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   if (wd->val == val) return;
-   wd->val = val;
-   if (wd->val < wd->val_min) wd->val = wd->val_min;
-   if (wd->val > wd->val_max) wd->val = wd->val_max;
-   edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-   _val_set(obj);
-   _units_set(obj);
-   _indicator_set(obj);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (sd->val == val) return;
+   sd->val = val;
+
+   if (sd->val < sd->val_min) sd->val = sd->val_min;
+   if (sd->val > sd->val_max) sd->val = sd->val_max;
+
+   _visuals_refresh(obj);
 }
 
 EAPI double
 elm_slider_value_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) 0.0;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return 0.0;
-   return wd->val;
+   ELM_SLIDER_CHECK(obj) 0.0;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->val;
 }
 
 EAPI void
-elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted)
+elm_slider_inverted_set(Evas_Object *obj,
+                        Eina_Bool inverted)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
    inverted = !!inverted;
-   if (wd->inverted == inverted) return;
-   wd->inverted = inverted;
-   if (wd->inverted)
-     edje_object_signal_emit(wd->slider, "elm,state,inverted,on", "elm");
+   if (sd->inverted == inverted) return;
+   sd->inverted = inverted;
+
+   if (sd->inverted)
+     {
+        elm_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,inverted,on", "elm");
+     }
    else
-     edje_object_signal_emit(wd->slider, "elm,state,inverted,off", "elm");
-   edje_object_message_signal_process(wd->slider);
-   _val_set(obj);
-   _units_set(obj);
-   _indicator_set(obj);
+     {
+        elm_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,inverted,off", "elm");
+     }
+
+   edje_object_message_signal_process(ELM_WIDGET_DATA(sd)->resize_obj);
+
+   _visuals_refresh(obj);
 }
 
 EAPI Eina_Bool
 elm_slider_inverted_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return EINA_FALSE;
-   return wd->inverted;
+   ELM_SLIDER_CHECK(obj) EINA_FALSE;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->inverted;
 }
 
 EAPI void
-elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
+elm_slider_indicator_format_function_set(Evas_Object *obj,
+                                         char *(*func)(double),
+                                         void (*free_func)(char *))
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   wd->indicator_format_func = func;
-   wd->indicator_format_free = free_func;
-   _indicator_set(obj);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   sd->indicator_format_func = func;
+   sd->indicator_format_free = free_func;
+   evas_object_smart_changed(obj);
 }
 
 EAPI void
-elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
+elm_slider_units_format_function_set(Evas_Object *obj,
+                                     char *(*func)(double),
+                                     void (*free_func)(char *))
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   wd->units_format_func = func;
-   wd->units_format_free = free_func;
-   _min_max_set(obj);
-   _units_set(obj);
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   sd->units_format_func = func;
+   sd->units_format_free = free_func;
+
+   evas_object_smart_changed(obj);
 }
 
 EAPI void
-elm_slider_indicator_show_set(Evas_Object *obj, Eina_Bool show)
+elm_slider_indicator_show_set(Evas_Object *obj,
+                              Eina_Bool show)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype);
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (show) {
-        wd->indicator_show = EINA_TRUE;
-        edje_object_signal_emit(wd->slider, "elm,state,val,show", "elm");
-   }
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   if (show)
+     {
+        sd->indicator_show = EINA_TRUE;
+        elm_layout_signal_emit(obj, "elm,state,val,show", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,val,show", "elm");
+     }
    else {
-        wd->indicator_show = EINA_FALSE;
-        edje_object_signal_emit(wd->slider, "elm,state,val,hide", "elm");
-   }
+        sd->indicator_show = EINA_FALSE;
+        elm_layout_signal_emit(obj, "elm,state,val,hide", "elm");
+        if (sd->popup)
+          edje_object_signal_emit(sd->popup, "elm,state,val,hide", "elm");
+     }
+
+   evas_object_smart_changed(obj);
 }
 
 EAPI Eina_Bool
 elm_slider_indicator_show_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return EINA_FALSE;
-   return wd->indicator_show;
+   ELM_SLIDER_CHECK(obj) EINA_FALSE;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->indicator_show;
 }
 
+EAPI void
+elm_slider_step_set(Evas_Object *obj,
+                     double step)
+{
+   ELM_SLIDER_CHECK(obj);
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   sd->step = step;
+}
+
+EAPI double
+elm_slider_step_get(const Evas_Object *obj)
+{
+   ELM_SLIDER_CHECK(obj) 0.0;
+   ELM_SLIDER_DATA_GET(obj, sd);
+
+   return sd->step;
+}