From be333cf0fdaf9a4ce690905a210044210911f3d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 21 Jun 2022 19:48:28 +0200 Subject: [PATCH] Wayland: Cleanup This moves what is effectively showing the window to where that is done on other platforms, i.e. last in the platform CreateWindow function. (cherry picked from commit 74b4ceb8354bbe3eb4d225bcc07c4ed4023ca1f2) --- src/wl_window.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wl_window.c b/src/wl_window.c index 482d90c6..fd625dbe 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -792,12 +792,6 @@ static GLFWbool createNativeSurface(_GLFWwindow* window, if (!window->wl.transparent) setContentAreaOpaque(window); - if (window->monitor || wndconfig->visible) - { - if (!createShellObjects(window)) - return GLFW_FALSE; - } - return GLFW_TRUE; } @@ -1903,6 +1897,12 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window, return GLFW_FALSE; } + if (window->monitor || wndconfig->visible) + { + if (!createShellObjects(window)) + return GLFW_FALSE; + } + return GLFW_TRUE; }