From 6d6bfeecfa85bb3596a5a5b080ba65e58c8e360c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 25 Sep 2019 17:55:55 -0400 Subject: [PATCH] theme: use more explicit signal names for C <- theme scrollbar signals Summary: ref T8231 Depends on D10161 Reviewers: segfaultxavi Reviewed By: segfaultxavi Subscribers: segfaultxavi, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8231 Differential Revision: https://phab.enlightenment.org/D10162 --- data/elementary/themes/edc/efl/scroller.edc | 6 +++--- src/lib/elementary/efl_ui_image_zoomable.c | 8 ++++---- src/lib/elementary/efl_ui_scroll_util.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/elementary/themes/edc/efl/scroller.edc b/data/elementary/themes/edc/efl/scroller.edc index aba12ffbc4..6e2769fdae 100644 --- a/data/elementary/themes/edc/efl/scroller.edc +++ b/data/elementary/themes/edc/efl/scroller.edc @@ -1101,7 +1101,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,down,*"; source: "efl.dragable.vbar"; - action: SIGNAL_EMIT "efl,vbar,press" "efl"; + action: SIGNAL_EMIT "efl,vertical_bar,press" "efl"; } program { signal: "mouse,up,1"; source: "efl.dragable.vbar"; @@ -1125,7 +1125,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,down,*"; source: "efl.dragable.hbar"; - action: SIGNAL_EMIT "efl,hbar,press" "efl"; + action: SIGNAL_EMIT "efl,horizontal_bar,press" "efl"; } program { signal: "mouse,up,1"; source: "efl.dragable.hbar"; @@ -1137,7 +1137,7 @@ group { name: "efl/scroller"; } program { signal: "mouse,up,*"; source: "efl.dragable.hbar"; - action: SIGNAL_EMIT "efl,hbar,unpress" "efl"; + action: SIGNAL_EMIT "efl,horizontal_bar,unpress" "efl"; } } } diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 1967c93bc4..ad4d0f57a4 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1658,7 +1658,7 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj) (obj, "drag,page", "efl.dragable.vbar", obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); efl_layout_signal_callback_add - (obj, "efl,vbar,press", "efl", + (obj, "efl,vertical_bar,press", "efl", obj, _efl_ui_image_zoomable_vbar_press_cb, NULL); efl_layout_signal_callback_add (obj, "efl,vbar,unpress", "efl", @@ -1682,7 +1682,7 @@ _efl_ui_image_zoomable_edje_object_attach(Eo *obj) (obj, "drag,page", "efl.dragable.hbar", obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); efl_layout_signal_callback_add - (obj, "efl,hbar,press", "efl", + (obj, "efl,horizontal_bar,press", "efl", obj, _efl_ui_image_zoomable_hbar_press_cb, NULL); efl_layout_signal_callback_add (obj, "efl,hbar,unpress", "efl", @@ -1769,7 +1769,7 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "efl.dragable.vbar", obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); efl_layout_signal_callback_del - (obj, "efl,vbar,press", "efl", + (obj, "efl,vertical_bar,press", "efl", obj, _efl_ui_image_zoomable_vbar_press_cb, NULL); efl_layout_signal_callback_del (obj, "efl,vbar,unpress", "efl", @@ -1793,7 +1793,7 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) (obj, "drag,page", "efl.dragable.hbar", obj, _efl_ui_image_zoomable_edje_drag_cb, NULL); efl_layout_signal_callback_del - (obj, "efl,hbar,press", "efl", + (obj, "efl,horizontal_bar,press", "efl", obj, _efl_ui_image_zoomable_hbar_press_cb, NULL); efl_layout_signal_callback_del (obj, "efl,hbar,unpress", "efl", diff --git a/src/lib/elementary/efl_ui_scroll_util.c b/src/lib/elementary/efl_ui_scroll_util.c index fba8ecdfd0..dec7e5dd28 100644 --- a/src/lib/elementary/efl_ui_scroll_util.c +++ b/src/lib/elementary/efl_ui_scroll_util.c @@ -269,7 +269,7 @@ efl_ui_scroll_connector_bind(Eo *obj, Eo *manager) ctx, _scroll_connector_edje_drag_cb, NULL); efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.vbar", ctx, _scroll_connector_edje_drag_cb, NULL); - efl_layout_signal_callback_add(obj, "efl,vbar,press", "efl", + efl_layout_signal_callback_add(obj, "efl,vertical_bar,press", "efl", ctx, _scroll_connector_vbar_press_cb, NULL); efl_layout_signal_callback_add(obj, "efl,vbar,unpress", "efl", ctx, _scroll_connector_vbar_unpress_cb, NULL); @@ -285,7 +285,7 @@ efl_ui_scroll_connector_bind(Eo *obj, Eo *manager) ctx, _scroll_connector_edje_drag_cb, NULL); efl_layout_signal_callback_add(obj, "drag,page", "efl.dragable.hbar", ctx, _scroll_connector_edje_drag_cb, NULL); - efl_layout_signal_callback_add(obj, "efl,hbar,press", "efl", + efl_layout_signal_callback_add(obj, "efl,horizontal_bar,press", "efl", ctx, _scroll_connector_hbar_press_cb, NULL); efl_layout_signal_callback_add(obj, "efl,hbar,unpress", "efl", ctx, _scroll_connector_hbar_unpress_cb, NULL); @@ -325,7 +325,7 @@ efl_ui_scroll_connector_unbind(Eo *obj) ctx, _scroll_connector_edje_drag_cb, NULL); efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.vbar", ctx, _scroll_connector_edje_drag_cb, NULL); - efl_layout_signal_callback_del(obj, "efl,vbar,press", "efl", + efl_layout_signal_callback_del(obj, "efl,vertical_bar,press", "efl", ctx, _scroll_connector_vbar_press_cb, NULL); efl_layout_signal_callback_del(obj, "efl,vbar,unpress", "efl", ctx, _scroll_connector_vbar_unpress_cb, NULL); @@ -342,7 +342,7 @@ efl_ui_scroll_connector_unbind(Eo *obj) ctx, _scroll_connector_edje_drag_cb, NULL); efl_layout_signal_callback_del(obj, "drag,page", "efl.dragable.hbar", ctx, _scroll_connector_edje_drag_cb, NULL); - efl_layout_signal_callback_del(obj, "efl,hbar,press", "efl", + efl_layout_signal_callback_del(obj, "efl,horizontal_bar,press", "efl", ctx, _scroll_connector_hbar_press_cb, NULL); efl_layout_signal_callback_del(obj, "efl,hbar,unpress", "efl", ctx, _scroll_connector_hbar_unpress_cb, NULL);