forked from enlightenment/efl
efl.ui.pan: namespace events to avoid conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8262
This commit is contained in:
parent
f629f11bed
commit
51ef57d47f
|
@ -143,7 +143,7 @@ _calc_job_cb(void *data)
|
|||
sd->minw = minw;
|
||||
sd->minh = minh;
|
||||
|
||||
efl_event_callback_call(sd->pan_obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
_sizing_eval(obj);
|
||||
}
|
||||
sd->calc_job = NULL;
|
||||
|
@ -398,7 +398,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_POSITION_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static Eina_Position2D
|
||||
|
|
|
@ -58,7 +58,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_POSITION_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, NULL);
|
||||
evas_object_smart_changed(psd->wobj);
|
||||
}
|
||||
|
||||
|
@ -865,7 +865,7 @@ _efl_ui_list_view_efl_ui_list_view_model_min_size_set(Eo *obj, Efl_Ui_List_View_
|
|||
pd->min.h = min.h;
|
||||
|
||||
evas_object_size_hint_min_set(wd->resize_obj, pd->min.w, pd->min.h);
|
||||
efl_event_callback_call(pd->pan_obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(pd->pan_obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
|
|
@ -47,7 +47,7 @@ _efl_ui_pan_efl_gfx_entity_size_set(Eo *obj, Efl_Ui_Pan_Data *psd, Eina_Size2D s
|
|||
psd->h = sz.h;
|
||||
|
||||
evas_object_smart_changed(obj);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_VIEWPORT_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_VIEWPORT_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static void
|
||||
|
@ -68,7 +68,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_POSITION_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static Eina_Position2D
|
||||
|
@ -126,7 +126,7 @@ _efl_ui_pan_content_del_cb(void *data,
|
|||
|
||||
psd->content = NULL;
|
||||
psd->content_w = psd->content_h = psd->px = psd->py = 0;
|
||||
efl_event_callback_call(pobj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(pobj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
@ -145,7 +145,7 @@ _efl_ui_pan_content_resize_cb(void *data,
|
|||
psd->content_h = sz.h;
|
||||
evas_object_smart_changed(pobj);
|
||||
}
|
||||
efl_event_callback_call(pobj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(pobj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
|
@ -179,7 +179,7 @@ _efl_ui_pan_efl_content_content_set(Evas_Object *obj, Efl_Ui_Pan_Data *psd, Evas
|
|||
|
||||
end:
|
||||
efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, content);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
|
@ -203,7 +203,7 @@ _efl_ui_pan_efl_content_content_unset(Eo *obj EINA_UNUSED, Efl_Ui_Pan_Data *pd)
|
|||
pd->content = NULL;
|
||||
pd->content_w = pd->content_h = pd->px = pd->py = 0;
|
||||
efl_event_callback_call(obj, EFL_CONTENT_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, NULL);
|
||||
efl_event_callback_call(obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, NULL);
|
||||
|
||||
return old_content;
|
||||
}
|
||||
|
|
|
@ -48,8 +48,8 @@ class @beta Efl.Ui.Pan extends Efl.Canvas.Group implements Efl.Content
|
|||
Efl.Canvas.Group.group_calculate;
|
||||
}
|
||||
events {
|
||||
content,changed: void; [[Called when pan content changed]]
|
||||
viewport,changed: void; [[Called when pan viewport changed]]
|
||||
position,changed: void; [[Called when pan position changed]]
|
||||
pan,content,changed: void; [[Called when pan content changed]]
|
||||
pan,viewport,changed: void; [[Called when pan viewport changed]]
|
||||
pan,position,changed: void; [[Called when pan position changed]]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2247,11 +2247,11 @@ _efl_ui_scroll_manager_pan_set(Eo *obj, Efl_Ui_Scroll_Manager_Data *sd, Eo *pan)
|
|||
if (sd->pan_obj)
|
||||
{
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
}
|
||||
|
||||
if (!pan)
|
||||
|
@ -2260,11 +2260,11 @@ _efl_ui_scroll_manager_pan_set(Eo *obj, Efl_Ui_Scroll_Manager_Data *sd, Eo *pan)
|
|||
sd->pan_obj = pan;
|
||||
|
||||
efl_event_callback_add
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
efl_event_callback_add
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
efl_event_callback_add
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
evas_object_event_callback_add(sd->pan_obj, EVAS_CALLBACK_RESIZE,
|
||||
_efl_ui_scroll_manager_pan_resized_cb, obj);
|
||||
evas_object_event_callback_add(sd->pan_obj, EVAS_CALLBACK_MOVE,
|
||||
|
@ -2452,11 +2452,11 @@ _efl_ui_scroll_manager_efl_object_destructor(Eo *obj, Efl_Ui_Scroll_Manager_Data
|
|||
evas_object_event_callback_del_full(sd->pan_obj, EVAS_CALLBACK_MOVE,
|
||||
_efl_ui_scroll_manager_pan_moved_cb, obj);
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_CONTENT_CHANGED, _efl_ui_scroll_manager_pan_content_changed_cb, sd);
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_VIEWPORT_CHANGED, _efl_ui_scroll_manager_pan_viewport_changed_cb, sd);
|
||||
efl_event_callback_del
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
(sd->pan_obj, EFL_UI_PAN_EVENT_PAN_POSITION_CHANGED, _efl_ui_scroll_manager_pan_position_changed_cb, sd);
|
||||
}
|
||||
efl_destructor(efl_super(obj, MY_CLASS));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue