From deab06f4bdb10807830ce226a8906712f7a0481c Mon Sep 17 00:00:00 2001 From: prashant Date: Mon, 10 Mar 2014 23:24:37 +0900 Subject: [PATCH] actionslider: Fixed mouse movement issue. @fix Summary: The name of the signal in edc (elm,right,mouse,down) was different from c (elm.right,mouse,down). After changed the signal name, mouse event is working as expected. Test Plan: elementary_test -to actionslider (click right left & center by mouse) Reviewers: seoz, singh.amitesh Differential Revision: https://phab.enlightenment.org/D618 --- legacy/elementary/data/themes/edc/elm/actionslider.edc | 6 +++--- legacy/elementary/src/lib/elm_actionslider.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/legacy/elementary/data/themes/edc/elm/actionslider.edc b/legacy/elementary/data/themes/edc/elm/actionslider.edc index 613dd925b9..75d6ad9716 100644 --- a/legacy/elementary/data/themes/edc/elm/actionslider.edc +++ b/legacy/elementary/data/themes/edc/elm/actionslider.edc @@ -231,15 +231,15 @@ group { name: "elm/actionslider/base/default"; } program { signal: "mouse,down,1*"; source: "elm.text.right"; - action: SIGNAL_EMIT "elm,right,mouse,down" "elm"; + action: SIGNAL_EMIT "elm,action,down,right" "elm"; } program { signal: "mouse,down,1*"; source: "elm.text.left"; - action: SIGNAL_EMIT "elm,left,mouse,down" "elm"; + action: SIGNAL_EMIT "elm,action,down,left" "elm"; } program { signal: "mouse,down,1*"; source: "elm.text.center"; - action: SIGNAL_EMIT "elm,center,mouse,down" "elm"; + action: SIGNAL_EMIT "elm,action,down,center" "elm"; } program { signal: "elm,state,disabled"; source: "elm"; diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 55d2e629a9..6cc92cc674 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -361,7 +361,7 @@ _track_move_cb(void *data, ELM_ACTIONSLIDER_DATA_GET(obj, sd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); - if (!strcmp(emission, "elm.right,mouse,down")) + if (!strcmp(emission, "elm,action,down,right")) { if (sd->final_position == 0.0) { @@ -383,7 +383,7 @@ _track_move_cb(void *data, sd->final_position = 1.0; } } - else if (!strcmp(emission, "elm.center,mouse,down")) + else if (!strcmp(emission, "elm,action,down,center")) { if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) { @@ -485,13 +485,13 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) (wd->resize_obj, "elm.drag_button,mouse,move", "*", _drag_button_move_cb, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,right,mouse,down", "*", + (wd->resize_obj, "elm,action,down,right", "*", _track_move_cb, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,left,mouse,down", "*", + (wd->resize_obj, "elm,action,down,left", "*", _track_move_cb, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,center,mouse,down", "*", + (wd->resize_obj, "elm,action,down,center", "*", _track_move_cb, obj); if (!elm_layout_theme_set