[Slideshow] Applying Open source patch r72492 to fix Switching in slideshow with...

[framework/uifw/elementary.git] / src / lib / elm_slider.c

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 13554ea..8f571a5 100644 (file)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -95,8 +95,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
    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")))
+   if ((!strcmp(ev->keyname, "Left")) ||
+       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
      {
         if (!wd->horizontal) return EINA_FALSE;
         if (!wd->inverted) _drag_down(obj, NULL, NULL, NULL);
@@ -104,8 +104,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Right"))
-            || (!strcmp(ev->keyname, "KP_Right")))
+   else if ((!strcmp(ev->keyname, "Right")) ||
+            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
      {
         if (!wd->horizontal) return EINA_FALSE;
         if (!wd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -113,7 +113,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
+   else if ((!strcmp(ev->keyname, "Up")) ||
+            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
      {
         if (wd->horizontal) return EINA_FALSE;
         if (wd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -121,7 +122,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+   else if ((!strcmp(ev->keyname, "Down")) ||
+            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
      {
         if (wd->horizontal) return EINA_FALSE;
         if (wd->inverted) _drag_down(obj, NULL, NULL, NULL);
@@ -173,7 +175,7 @@ _labels_foreach_text_set(const Eina_Hash *hash __UNUSED__, const void *key, void
 {
   Widget_Data *wd = fdata;
 
-  edje_object_part_text_set(wd->slider, key, data);
+  edje_object_part_text_escaped_set(wd->slider, key, data);
 
   return 1;
 }
@@ -189,6 +191,10 @@ _theme_hook(Evas_Object *obj)
      _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)
      {
         edje_object_part_swallow(wd->slider, "elm.swallow.content", wd->icon);
@@ -350,7 +356,7 @@ _units_set(Evas_Object *obj)
      {
         char *buf;
         buf = wd->units_format_func(wd->val);
-        edje_object_part_text_set(wd->slider, "elm.units", buf);
+        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)
@@ -358,10 +364,10 @@ _units_set(Evas_Object *obj)
         char buf[1024];
 
         snprintf(buf, sizeof(buf), wd->units, wd->val);
-        edje_object_part_text_set(wd->slider, "elm.units", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
      }
    else
-     edje_object_part_text_set(wd->slider, "elm.units", NULL);
+     edje_object_part_text_escaped_set(wd->slider, "elm.units", NULL);
 }
 
 static void
@@ -373,40 +379,49 @@ _indicator_set(Evas_Object *obj)
      {
         char *buf;
         buf = wd->indicator_format_func(wd->val);
-        edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
         if (wd->indicator_format_free) wd->indicator_format_free(buf);
      }
    else if (wd->indicator)
      {
         char buf[1024];
         snprintf(buf, sizeof(buf), wd->indicator, wd->val);
-        edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
      }
    else
-     edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
+     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__)
 {
+   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);
 }
 
 static void
 _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
+   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);
 }
 
 static void
 _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
+   if (elm_widget_disabled_get(data)) return;
    _val_fetch(data);
    evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
    _units_set(data);
@@ -417,6 +432,7 @@ _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
 static void
 _drag_step(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
+   if (elm_widget_disabled_get(data)) return;
    _val_fetch(data);
    _units_set(data);
    _indicator_set(data);
@@ -427,6 +443,7 @@ _drag_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED_
 {
    double step;
    Widget_Data *wd;
+   if (elm_widget_disabled_get(data)) return;
 
    wd = elm_widget_data_get(data);
    step = 0.05;
@@ -441,6 +458,7 @@ _drag_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
 {
    double step;
    Widget_Data *wd;
+   if (elm_widget_disabled_get(data)) return;
 
    wd = elm_widget_data_get(data);
    step = -0.05;
@@ -457,12 +475,14 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
    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)
      {
         button_x = ((double)ev->canvas.x - (double)x) / (double)w;
@@ -481,6 +501,8 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
    _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
@@ -490,6 +512,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
    Evas_Event_Mouse_Move *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;
 
    if  (wd->spacer_down)
      {
@@ -503,7 +526,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
              if (!wd->frozen)
                {
                   elm_widget_scroll_freeze_push(data);
-                  wd->frozen = 1;
+                  wd->frozen = EINA_TRUE;
                }
              ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
           }
@@ -518,7 +541,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
              if (wd->frozen)
                {
                   elm_widget_scroll_freeze_pop(data);
-                  wd->frozen = 0;
+                  wd->frozen = EINA_FALSE;
                }
              edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
              elm_slider_value_set(data, wd->val2);
@@ -540,6 +563,8 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
         _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);
      }
 }
 
@@ -547,9 +572,10 @@ 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;
-   if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
+
+   wd->spacer_down = EINA_FALSE;
    _val_fetch(data);
    evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
    _units_set(data);
@@ -557,7 +583,7 @@ _spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
    if (wd->frozen)
      {
         elm_widget_scroll_freeze_pop(data);
-        wd->frozen = 0;
+        wd->frozen = EINA_FALSE;
      }
    edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
 }
@@ -603,7 +629,7 @@ _elm_slider_label_set(Evas_Object *obj, const char *part, const char *label)
         edje_object_message_signal_process(wd->slider);
      }
 
-   edje_object_part_text_set(wd->slider, real_part, label);
+   edje_object_part_text_escaped_set(wd->slider, real_part, label);
    _sizing_eval(obj);
 }
 
@@ -768,8 +794,8 @@ _min_max_set(Evas_Object *obj)
         snprintf((char*) buf_max, length + 128, wd->units, wd->val_max);
      }
 
-   edje_object_part_text_set(wd->slider, "elm.units.min", buf_min);
-   edje_object_part_text_set(wd->slider, "elm.units.max", buf_max);
+   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);
 
    if (wd->units_format_func && wd->units_format_free)
      {
@@ -980,6 +1006,7 @@ elm_slider_value_set(Evas_Object *obj, double val)
    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);