From c8c59a2139bd69d7a816e0efc67daa8b90665b28 Mon Sep 17 00:00:00 2001 From: Frank Praznik <frank.praznik@gmail.com> Date: Wed, 20 Apr 2022 08:58:58 -0400 Subject: [PATCH] Fix a -Wshadow warning --- src/video/wayland/SDL_waylandwindow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c index 9abf86834..0bbae4691 100644 --- a/src/video/wayland/SDL_waylandwindow.c +++ b/src/video/wayland/SDL_waylandwindow.c @@ -668,15 +668,15 @@ Wayland_PopupWatch(void *data, SDL_Event *event) { if (event->type == SDL_MOUSEMOTION) { SDL_Window *window = (SDL_Window *) data; - SDL_WindowData *data = window->driverdata; + SDL_WindowData *wind = window->driverdata; /* Coordinates might be relative to the popup, which we don't want */ - if (event->motion.windowID == data->shell_surface.xdg.roleobj.popup.parentID) { - xdg_positioner_set_offset(data->shell_surface.xdg.roleobj.popup.positioner, + if (event->motion.windowID == wind->shell_surface.xdg.roleobj.popup.parentID) { + xdg_positioner_set_offset(wind->shell_surface.xdg.roleobj.popup.positioner, event->motion.x + TOOLTIP_CURSOR_OFFSET, event->motion.y + TOOLTIP_CURSOR_OFFSET); - xdg_popup_reposition(data->shell_surface.xdg.roleobj.popup.popup, - data->shell_surface.xdg.roleobj.popup.positioner, + xdg_popup_reposition(wind->shell_surface.xdg.roleobj.popup.popup, + wind->shell_surface.xdg.roleobj.popup.positioner, 0); } }