enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

elm_*: make scrolling correct again 

in revision D9859 the scroll events have been renamed. However this also
renamed the legacy widgets, which also renamed the evas smart events,
which is a bug. With this commit we are back to plain old
evas_smart_callback_call calls, as these just take the string, and do
not need the bypassing through the eo events.

This fixes:
- elm_test gengrid,toolbar,panel (the events are now shown correctly
again)
- scrolling in elm_code_widget
- elm_map in a touchscreen

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Differential Revision: https://phab.enlightenment.org/D10240
This commit is contained in:
Marcel Hollerbach 2019-09-28 18:02:56 +02:00
parent 2a1ef9fce7
commit a864d62ecf
7 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/elementary/elm_entry.c
View File

@ -5149,8 +5149,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
{
ELM_ENTRY_DATA_GET(obj, sd);
/* here we need to emit the signal that the elm_scroller would have done */
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(obj, "scroll", NULL);
if (sd->have_selection)
_update_selection_handler(obj);

10
src/lib/elementary/elm_gengrid.c
View File

@ -3714,28 +3714,28 @@ static void
_scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
evas_object_smart_callback_call(obj, "anim,start", NULL);
}
static void
_scroll_animate_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
evas_object_smart_callback_call(obj, "anim,stop", NULL);
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
evas_object_smart_callback_call(obj, "drag,start", NULL);
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
evas_object_smart_callback_call(obj, "drag,stop", NULL);
}
static void
@ -3777,7 +3777,7 @@ static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(obj, "changed", NULL);
}
static int

10
src/lib/elementary/elm_genlist.c
View File

@ -5541,35 +5541,35 @@ static void
_scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
evas_object_smart_callback_call(obj, "anim,start", NULL);
}
static void
_scroll_animate_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
evas_object_smart_callback_call(obj, "anim,stop", NULL);
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
evas_object_smart_callback_call(obj, "drag,start", NULL);
}
static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(obj, "changed", NULL);
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
evas_object_smart_callback_call(obj, "drag,stop", NULL);
}
static void

15
src/lib/elementary/elm_map.c
View File

@ -1307,8 +1307,7 @@ _scr_timeout_cb(void *data)
_smooth_update(sd);
sd->scr_timer = NULL;
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
evas_object_smart_callback_call(sd->obj, "drag,stop", NULL);
return ECORE_CALLBACK_CANCEL;
}
@ -1321,12 +1320,10 @@ _scroll_cb(Evas_Object *obj,
if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
else
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
evas_object_smart_callback_call(sd->obj, "drag,stop", NULL);
ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(sd->obj, "scroll", NULL);
}
static void
@ -1335,8 +1332,7 @@ _scroll_animate_start_cb(Evas_Object *obj,
{
ELM_MAP_DATA_GET(obj, sd);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
evas_object_smart_callback_call(sd->obj, "anim,start", NULL);
}
static void
@ -1345,8 +1341,7 @@ _scroll_animate_stop_cb(Evas_Object *obj,
{
ELM_MAP_DATA_GET(obj, sd);
efl_event_callback_legacy_call
(sd->obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
evas_object_smart_callback_call(sd->obj, "anim,stop", NULL);
}
static Eina_Bool

3
src/lib/elementary/elm_panel.c
View File

@ -1232,8 +1232,7 @@ _scroll_cb(Evas_Object *obj, void *data EINA_UNUSED)
}
break;
}
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_CHANGED, (void *) &event);
evas_object_smart_callback_call(obj, "scroll", &event);
}
EOLIAN static void

16
src/lib/elementary/elm_scroller.c
View File

@ -487,8 +487,7 @@ static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(obj, "scroll", NULL);
}
static void
@ -523,32 +522,29 @@ static void
_scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
evas_object_smart_callback_call(obj, "anim,start", NULL);
}
static void
_scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
evas_object_smart_callback_call(obj, "anim,stop", NULL);
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
evas_object_smart_callback_call(obj, "drag,start", NULL);
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call
(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
evas_object_smart_callback_call(obj, "drag,stop", NULL);
}
static void

10
src/lib/elementary/elm_toolbar.c
View File

@ -2235,21 +2235,21 @@ static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_CHANGED, NULL);
evas_object_smart_callback_call(obj, "scroll", NULL);
}
static void
_scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_STARTED, NULL);
evas_object_smart_callback_call(obj, "anim,start", NULL);
}
static void
_scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_ANIM_FINISHED, NULL);
evas_object_smart_callback_call(obj, "anim,stop", NULL);
}
static void
@ -2259,14 +2259,14 @@ _scroll_drag_start_cb(Evas_Object *obj,
ELM_TOOLBAR_DATA_GET(obj, sd);
ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_STARTED, NULL);
evas_object_smart_callback_call(obj, "drag,start", NULL);
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
efl_event_callback_legacy_call(obj, EFL_UI_EVENT_SCROLL_DRAG_FINISHED, NULL);
evas_object_smart_callback_call(obj, "drag,stop", NULL);
}
static void