summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/themes/edc/elm/actionslider.edc6
-rw-r--r--src/lib/elm_actionslider.c11
2 files changed, 14 insertions, 3 deletions
diff --git a/data/themes/edc/elm/actionslider.edc b/data/themes/edc/elm/actionslider.edc
index 75d6ad971..0950396de 100644
--- a/data/themes/edc/elm/actionslider.edc
+++ b/data/themes/edc/elm/actionslider.edc
@@ -207,7 +207,7 @@ group { name: "elm/actionslider/base/default";
207 programs { 207 programs {
208 program { 208 program {
209 signal: "mouse,up,1"; source: "elm.drag_button"; 209 signal: "mouse,up,1"; source: "elm.drag_button";
210 action: SIGNAL_EMIT "elm.drag_button,mouse,up" "elm"; 210 action: SIGNAL_EMIT "elm,action,up,drag_button" "elm";
211 after: "button_unclick_anim"; 211 after: "button_unclick_anim";
212 } 212 }
213 program { name: "button_unclick_anim"; 213 program { name: "button_unclick_anim";
@@ -217,7 +217,7 @@ group { name: "elm/actionslider/base/default";
217 } 217 }
218 program { 218 program {
219 signal: "mouse,down,1*"; source: "elm.drag_button"; 219 signal: "mouse,down,1*"; source: "elm.drag_button";
220 action: SIGNAL_EMIT "elm.drag_button,mouse,down" "elm"; 220 action: SIGNAL_EMIT "elm,action,down,drag_button" "elm";
221 after: "button_click_anim"; 221 after: "button_click_anim";
222 } 222 }
223 program { name: "button_click_anim"; 223 program { name: "button_click_anim";
@@ -227,7 +227,7 @@ group { name: "elm/actionslider/base/default";
227 } 227 }
228 program { 228 program {
229 signal: "mouse,move"; source: "elm.drag_button_base"; 229 signal: "mouse,move"; source: "elm.drag_button_base";
230 action: SIGNAL_EMIT "elm.drag_button,mouse,move" "elm"; 230 action: SIGNAL_EMIT "elm,action,move,drag_button" "elm";
231 } 231 }
232 program { 232 program {
233 signal: "mouse,down,1*"; source: "elm.text.right"; 233 signal: "mouse,down,1*"; source: "elm.text.right";
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 6cc92cc67..2e7aaeb6d 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -475,6 +475,7 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
475 evas_object_rectangle_add(evas_object_evas_get(obj)); 475 evas_object_rectangle_add(evas_object_evas_get(obj));
476 evas_object_color_set(priv->drag_button_base, 0, 0, 0, 0); 476 evas_object_color_set(priv->drag_button_base, 0, 0, 0, 0);
477 477
478 // dirty support for the backward compatibility
478 edje_object_signal_callback_add 479 edje_object_signal_callback_add
479 (wd->resize_obj, "elm.drag_button,mouse,up", "*", 480 (wd->resize_obj, "elm.drag_button,mouse,up", "*",
480 _drag_button_up_cb, obj); 481 _drag_button_up_cb, obj);
@@ -484,6 +485,16 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
484 edje_object_signal_callback_add 485 edje_object_signal_callback_add
485 (wd->resize_obj, "elm.drag_button,mouse,move", "*", 486 (wd->resize_obj, "elm.drag_button,mouse,move", "*",
486 _drag_button_move_cb, obj); 487 _drag_button_move_cb, obj);
488
489 edje_object_signal_callback_add
490 (wd->resize_obj, "elm,action,up,drag_button", "elm",
491 _drag_button_up_cb, obj);
492 edje_object_signal_callback_add
493 (wd->resize_obj, "elm,action,down,drag_button", "elm",
494 _drag_button_down_cb, obj);
495 edje_object_signal_callback_add
496 (wd->resize_obj, "elm,action,move,drag_button", "elm",
497 _drag_button_move_cb, obj);
487 edje_object_signal_callback_add 498 edje_object_signal_callback_add
488 (wd->resize_obj, "elm,action,down,right", "*", 499 (wd->resize_obj, "elm,action,down,right", "*",
489 _track_move_cb, obj); 500 _track_move_cb, obj);