Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-12-01 14:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Cleanup

Browse Source 
(cherry picked from commit 88a39006e3)
This commit is contained in:
Camilla Löwy 2022-06-21 23:19:40 +02:00
parent 20d11f7f97
commit 5937eec914
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wl_window.c
View File

@ -647,9 +647,7 @@ static GLFWbool createShellObjects(_GLFWwindow* window)
return GLFW_FALSE; return GLFW_FALSE;
} }
xdg_surface_add_listener(window->wl.xdg.surface, xdg_surface_add_listener(window->wl.xdg.surface, &xdgSurfaceListener, window);
&xdgSurfaceListener,
window);
window->wl.xdg.toplevel = xdg_surface_get_toplevel(window->wl.xdg.surface); window->wl.xdg.toplevel = xdg_surface_get_toplevel(window->wl.xdg.surface);
if (!window->wl.xdg.toplevel) if (!window->wl.xdg.toplevel)
@ -659,17 +657,14 @@ static GLFWbool createShellObjects(_GLFWwindow* window)
return GLFW_FALSE; return GLFW_FALSE;
} }
xdg_toplevel_add_listener(window->wl.xdg.toplevel, xdg_toplevel_add_listener(window->wl.xdg.toplevel, &xdgToplevelListener, window);
&xdgToplevelListener,
window);
if (window->wl.title) if (window->wl.title)
xdg_toplevel_set_title(window->wl.xdg.toplevel, window->wl.title); xdg_toplevel_set_title(window->wl.xdg.toplevel, window->wl.title);
if (window->monitor) if (window->monitor)
{ {
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel, xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel, window->monitor->wl.output);
window->monitor->wl.output);
setIdleInhibitor(window, GLFW_TRUE); setIdleInhibitor(window, GLFW_TRUE);
} }
else else