From 9cec14918c089d94a742cb067872181dd452b7ef Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 31 Oct 2017 16:36:32 +0900 Subject: evas: Move evas_canvas.eo to legacy-only This isn't meant to be installed. The canvas API in EO is based around the interfaces Efl.Canvas and the widget Efl.Ui.Win. Anything else is not EO (eg: ecore_evas, evas, ...) Note: evas_canvas3d is the last remaining thing that is installed along EO files, but those are all beta APIs. --- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/elm_cnp.c | 2 +- src/lib/elementary/els_tooltip.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/elementary') diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 58b7fc1171..4904a13e10 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -4138,7 +4138,7 @@ _elm_win_frame_cb_menu(void *data, int x, y, wx, wy; if (!sd->wl.win) return; - evas_canvas_pointer_canvas_xy_get(sd->evas, &x, &y); + evas_pointer_canvas_xy_get(sd->evas, &x, &y); ecore_wl2_window_geometry_get(sd->wl.win, &wx, &wy, NULL, NULL); if (x < 0) x += wx; if (y < 0) y += wy; diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c index 39528de8cb..e7ac5cb625 100644 --- a/src/lib/elementary/elm_cnp.c +++ b/src/lib/elementary/elm_cnp.c @@ -2922,7 +2922,7 @@ _wl_default_seat_get(Ecore_Wl2_Window *win, Evas_Object *obj) return input; } - seat = evas_canvas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT); + seat = evas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT); EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL); return ecore_wl2_display_input_find(ecore_wl2_window_display_get(win), evas_device_seat_id_get(seat)); diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c index 84fe835afa..4eaea65cf7 100644 --- a/src/lib/elementary/els_tooltip.c +++ b/src/lib/elementary/els_tooltip.c @@ -544,14 +544,14 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt) &basex, &basey, &cw, &ch); elm_win_screen_position_get(elm_widget_top_get(tt->owner), &cx, &cy); - evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); + evas_pointer_canvas_xy_get(tt->evas, &px, &py); cx -= basex; cy -= basey; } else { evas_output_size_get(tt->evas, &cw, &ch); - evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); + evas_pointer_canvas_xy_get(tt->evas, &px, &py); } TTDBG("SCREEN: cw=%d,ch=%d\n", cw, ch); -- cgit v1.2.1