summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-31 16:36:32 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-11-01 11:22:33 +0900
commit9cec14918c089d94a742cb067872181dd452b7ef (patch)
tree59fd6ae40189a1c9e500d795ae09bc88076b3096 /src/lib/elementary
parentb8ca1272aee00314ca2cfb10214f36590084f6f0 (diff)
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.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_win.c2
-rw-r--r--src/lib/elementary/elm_cnp.c2
-rw-r--r--src/lib/elementary/els_tooltip.c4
3 files changed, 4 insertions, 4 deletions
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,
4138 int x, y, wx, wy; 4138 int x, y, wx, wy;
4139 4139
4140 if (!sd->wl.win) return; 4140 if (!sd->wl.win) return;
4141 evas_canvas_pointer_canvas_xy_get(sd->evas, &x, &y); 4141 evas_pointer_canvas_xy_get(sd->evas, &x, &y);
4142 ecore_wl2_window_geometry_get(sd->wl.win, &wx, &wy, NULL, NULL); 4142 ecore_wl2_window_geometry_get(sd->wl.win, &wx, &wy, NULL, NULL);
4143 if (x < 0) x += wx; 4143 if (x < 0) x += wx;
4144 if (y < 0) y += wy; 4144 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)
2922 return input; 2922 return input;
2923 } 2923 }
2924 2924
2925 seat = evas_canvas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT); 2925 seat = evas_default_device_get(evas_object_evas_get(obj), EFL_INPUT_DEVICE_TYPE_SEAT);
2926 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL); 2926 EINA_SAFETY_ON_NULL_RETURN_VAL(seat, NULL);
2927 return ecore_wl2_display_input_find(ecore_wl2_window_display_get(win), 2927 return ecore_wl2_display_input_find(ecore_wl2_window_display_get(win),
2928 evas_device_seat_id_get(seat)); 2928 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)
544 &basex, &basey, &cw, &ch); 544 &basex, &basey, &cw, &ch);
545 elm_win_screen_position_get(elm_widget_top_get(tt->owner), 545 elm_win_screen_position_get(elm_widget_top_get(tt->owner),
546 &cx, &cy); 546 &cx, &cy);
547 evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); 547 evas_pointer_canvas_xy_get(tt->evas, &px, &py);
548 cx -= basex; 548 cx -= basex;
549 cy -= basey; 549 cy -= basey;
550 } 550 }
551 else 551 else
552 { 552 {
553 evas_output_size_get(tt->evas, &cw, &ch); 553 evas_output_size_get(tt->evas, &cw, &ch);
554 evas_canvas_pointer_canvas_xy_get(tt->evas, &px, &py); 554 evas_pointer_canvas_xy_get(tt->evas, &px, &py);
555 } 555 }
556 TTDBG("SCREEN: cw=%d,ch=%d\n", cw, ch); 556 TTDBG("SCREEN: cw=%d,ch=%d\n", cw, ch);
557 557