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

efl_ui/pan: add position info to pan,content_position,changed event 

Summary:
changed events should always send the related data when possible

ref T7708
Depends on D9789

Reviewers: segfaultxavi

Reviewed By: segfaultxavi

Subscribers: segfaultxavi, cedric, #reviewers, #committers

Tags: #efl_widgets

Maniphest Tasks: T7708

Differential Revision: https://phab.enlightenment.org/D9790
This commit is contained in:
Mike Blumenkrantz 2019-08-30 14:48:04 -04:00
parent e50cf9b2a2
commit 7142acd19c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/elementary/efl_ui_collection.c
View File

@ -198,17 +198,17 @@ _pan_viewport_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
}
static void
_pan_position_changed_cb(void *data, const Efl_Event *ev EINA_UNUSED)
_pan_position_changed_cb(void *data, const Efl_Event *ev)
{
MY_DATA_GET(data, pd);
Eina_Position2D pos = efl_ui_pan_position_get(pd->pan);
Eina_Position2D *pos = ev->info;
Eina_Position2D max = efl_ui_pan_position_max_get(pd->pan);
Eina_Vector2 rpos = {0.0, 0.0};
if (max.x > 0.0)
rpos.x = (double)pos.x/(double)max.x;
rpos.x = (double)pos->x/(double)max.x;
if (max.y > 0.0)
rpos.y = (double)pos.y/(double)max.y;
rpos.y = (double)pos->y/(double)max.y;
efl_ui_position_manager_entity_scroll_position_set(pd->pos_man, rpos.x, rpos.y);
}

2
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -402,7 +402,7 @@ _efl_ui_image_zoomable_pan_efl_ui_pan_pan_position_set(Eo *obj, Efl_Ui_Image_Zoo
psd->wsd->pan_y = pos.y;
evas_object_smart_changed(obj);
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, NULL);
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, &pos);
}
EOLIAN static Eina_Position2D

2
src/lib/elementary/efl_ui_list_view.c
View File

@ -59,7 +59,7 @@ _efl_ui_list_view_pan_efl_ui_pan_pan_position_set(Eo *obj EINA_UNUSED, Efl_Ui_Li
psd->gmt.x = pos.x;
psd->gmt.y = pos.y;
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, NULL);
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, &pos);
evas_object_smart_changed(psd->wobj);
}

2
src/lib/elementary/efl_ui_pan.c
View File

@ -69,7 +69,7 @@ _efl_ui_pan_pan_position_set(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *psd, Eina_Pos
psd->py = pos.y;
evas_object_smart_changed(obj);
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, NULL);
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_POSITION_CHANGED, &pos);
}
EOLIAN static Eina_Position2D

2
src/lib/elementary/efl_ui_pan.eo
View File

@ -65,7 +65,7 @@ class @beta Efl.Ui.Pan extends Efl.Canvas.Group implements Efl.Content
}
events {
pan,viewport,changed: void; [[This widget's position or size has changed.]]
pan,content_position,changed: void; [[The content's position has changed.]]
pan,content_position,changed: Eina.Position2D; [[The content's position has changed, its position in the event is the new position.]]
pan,content_size,changed: Eina.Size2D; [[The content's size has changed, its size in the event is the new size]]
}
}