summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprashant <pb.ingale@samsung.com>2014-03-10 23:24:37 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2014-03-11 01:33:06 +0900
commit70970f011dc2ac4a79ce7168324d6fb1bcc4c5cf (patch)
treef6f0719d2adba27df3582b5ac8105d1e8419a0bd
parenta408affcea0e7d9f31e4c7ca997b0192cfb0b65a (diff)
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
-rw-r--r--data/themes/edc/elm/actionslider.edc6
-rw-r--r--src/lib/elm_actionslider.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/data/themes/edc/elm/actionslider.edc b/data/themes/edc/elm/actionslider.edc
index 613dd925b..75d6ad971 100644
--- a/data/themes/edc/elm/actionslider.edc
+++ b/data/themes/edc/elm/actionslider.edc
@@ -231,15 +231,15 @@ group { name: "elm/actionslider/base/default";
231 } 231 }
232 program { 232 program {
233 signal: "mouse,down,1*"; source: "elm.text.right"; 233 signal: "mouse,down,1*"; source: "elm.text.right";
234 action: SIGNAL_EMIT "elm,right,mouse,down" "elm"; 234 action: SIGNAL_EMIT "elm,action,down,right" "elm";
235 } 235 }
236 program { 236 program {
237 signal: "mouse,down,1*"; source: "elm.text.left"; 237 signal: "mouse,down,1*"; source: "elm.text.left";
238 action: SIGNAL_EMIT "elm,left,mouse,down" "elm"; 238 action: SIGNAL_EMIT "elm,action,down,left" "elm";
239 } 239 }
240 program { 240 program {
241 signal: "mouse,down,1*"; source: "elm.text.center"; 241 signal: "mouse,down,1*"; source: "elm.text.center";
242 action: SIGNAL_EMIT "elm,center,mouse,down" "elm"; 242 action: SIGNAL_EMIT "elm,action,down,center" "elm";
243 } 243 }
244 program { 244 program {
245 signal: "elm,state,disabled"; source: "elm"; 245 signal: "elm,state,disabled"; source: "elm";
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 55d2e629a..6cc92cc67 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -361,7 +361,7 @@ _track_move_cb(void *data,
361 ELM_ACTIONSLIDER_DATA_GET(obj, sd); 361 ELM_ACTIONSLIDER_DATA_GET(obj, sd);
362 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 362 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
363 363
364 if (!strcmp(emission, "elm.right,mouse,down")) 364 if (!strcmp(emission, "elm,action,down,right"))
365 { 365 {
366 if (sd->final_position == 0.0) 366 if (sd->final_position == 0.0)
367 { 367 {
@@ -383,7 +383,7 @@ _track_move_cb(void *data,
383 sd->final_position = 1.0; 383 sd->final_position = 1.0;
384 } 384 }
385 } 385 }
386 else if (!strcmp(emission, "elm.center,mouse,down")) 386 else if (!strcmp(emission, "elm,action,down,center"))
387 { 387 {
388 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) 388 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
389 { 389 {
@@ -485,13 +485,13 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
485 (wd->resize_obj, "elm.drag_button,mouse,move", "*", 485 (wd->resize_obj, "elm.drag_button,mouse,move", "*",
486 _drag_button_move_cb, obj); 486 _drag_button_move_cb, obj);
487 edje_object_signal_callback_add 487 edje_object_signal_callback_add
488 (wd->resize_obj, "elm,right,mouse,down", "*", 488 (wd->resize_obj, "elm,action,down,right", "*",
489 _track_move_cb, obj); 489 _track_move_cb, obj);
490 edje_object_signal_callback_add 490 edje_object_signal_callback_add
491 (wd->resize_obj, "elm,left,mouse,down", "*", 491 (wd->resize_obj, "elm,action,down,left", "*",
492 _track_move_cb, obj); 492 _track_move_cb, obj);
493 edje_object_signal_callback_add 493 edje_object_signal_callback_add
494 (wd->resize_obj, "elm,center,mouse,down", "*", 494 (wd->resize_obj, "elm,action,down,center", "*",
495 _track_move_cb, obj); 495 _track_move_cb, obj);
496 496
497 if (!elm_layout_theme_set 497 if (!elm_layout_theme_set