mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Fix auto-iconify on kwin_wayland

Browse Source 
We now keep track of the fullscreen and activated state and only iconify
if we were previously fullscreen and now we are either not fullscreen or
not activated anymore.

This is the proper way to do it, compared to the previous hack where we
didn’t iconify only if it was the first configure event received.
This commit is contained in:
Emmanuel Gil Peyrot 2019-02-15 18:12:06 +01:00
parent edf0a07174
commit 45bd991ea9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wl_platform.h
View File

@ -208,8 +208,7 @@ typedef struct _GLFWwindowWayland
struct zwp_idle_inhibitor_v1* idleInhibitor; struct zwp_idle_inhibitor_v1* idleInhibitor;
// This is a hack to prevent auto-iconification on creation. GLFWbool wasFullscreen;
GLFWbool justCreated;
struct { struct {
GLFWbool serverSide; GLFWbool serverSide;

14
src/wl_window.c
View File

@ -641,10 +641,17 @@ static void xdgToplevelHandleConfigure(void* data,
_glfwInputWindowDamage(window); _glfwInputWindowDamage(window);
} }
if (!window->wl.justCreated && !activated && window->monitor && window->autoIconify) if (window->wl.wasFullscreen && window->autoIconify)
_glfwPlatformIconifyWindow(window); {
if (!activated || !fullscreen)
{
_glfwPlatformIconifyWindow(window);
window->wl.wasFullscreen = GLFW_FALSE;
}
}
if (fullscreen && activated)
window->wl.wasFullscreen = GLFW_TRUE;
_glfwInputWindowFocus(window, activated); _glfwInputWindowFocus(window, activated);
window->wl.justCreated = GLFW_FALSE;
} }
static void xdgToplevelHandleClose(void* data, static void xdgToplevelHandleClose(void* data,
@ -913,7 +920,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig, const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
window->wl.justCreated = GLFW_TRUE;
window->wl.transparent = fbconfig->transparent; window->wl.transparent = fbconfig->transparent;
if (!createSurface(window, wndconfig)) if (!createSurface(window, wndconfig))