enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

actionslider: Fixed wrong signal names but still support backward 

compatibility.

- "elm.drag_button,mouse,up" -> "elm,action,up,drag_button"
- "elm.drag_button,mouse,down" -> "elm,action,down,drag_button"
- "elm.drag_button,mouse,move" -> "elm,action,move,drag_button"

This is not the target of backport.
This commit is contained in:
Daniel Juyung Seo 2014-03-11 02:27:26 +09:00
parent deab06f4bd
commit 01224a2641
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/data/themes/edc/elm/actionslider.edc
View File

@ -207,7 +207,7 @@ group { name: "elm/actionslider/base/default";
programs {
program {
signal: "mouse,up,1"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm.drag_button,mouse,up" "elm";
action: SIGNAL_EMIT "elm,action,up,drag_button" "elm";
after: "button_unclick_anim";
}
program { name: "button_unclick_anim";
@ -217,7 +217,7 @@ group { name: "elm/actionslider/base/default";
}
program {
signal: "mouse,down,1*"; source: "elm.drag_button";
action: SIGNAL_EMIT "elm.drag_button,mouse,down" "elm";
action: SIGNAL_EMIT "elm,action,down,drag_button" "elm";
after: "button_click_anim";
}
program { name: "button_click_anim";
@ -227,7 +227,7 @@ group { name: "elm/actionslider/base/default";
}
program {
signal: "mouse,move"; source: "elm.drag_button_base";
action: SIGNAL_EMIT "elm.drag_button,mouse,move" "elm";
action: SIGNAL_EMIT "elm,action,move,drag_button" "elm";
}
program {
signal: "mouse,down,1*"; source: "elm.text.right";

11
legacy/elementary/src/lib/elm_actionslider.c
View File

@ -475,6 +475,7 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
evas_object_rectangle_add(evas_object_evas_get(obj));
evas_object_color_set(priv->drag_button_base, 0, 0, 0, 0);
// dirty support for the backward compatibility
edje_object_signal_callback_add
(wd->resize_obj, "elm.drag_button,mouse,up", "*",
_drag_button_up_cb, obj);
@ -484,6 +485,16 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
edje_object_signal_callback_add
(wd->resize_obj, "elm.drag_button,mouse,move", "*",
_drag_button_move_cb, obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,action,up,drag_button", "elm",
_drag_button_up_cb, obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,action,down,drag_button", "elm",
_drag_button_down_cb, obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,action,move,drag_button", "elm",
_drag_button_move_cb, obj);
edje_object_signal_callback_add
(wd->resize_obj, "elm,action,down,right", "*",
_track_move_cb, obj);