organicmaps/glfw
13
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-05 05:25:07 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge 54ecc8a9f5 into e7ea71be03

Browse source
This commit is contained in:
Rémi Bernon 2025-02-17 10:57:28 +01:00 • committed by GitHub
commit 88b0625db6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/x11_window.c
View file

@ -2339,6 +2339,9 @@ void _glfwRestoreWindowX11(_GLFWwindow* window)
if (_glfwWindowIconifiedX11(window))
{
// Some window managers do not unmap iconified windows, and XMapWindow is
// then no-op. Explicitly unmap the window to make sure it gets restored.
XUnmapWindow(_glfw.x11.display, window->x11.handle);
XMapWindow(_glfw.x11.display, window->x11.handle);
waitForVisibilityNotify(window);
}

8
tests/iconify.c
View file

@ -56,6 +56,8 @@ static void error_callback(int error, const char* description)
static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
{
static GLFWwindow *iconified;
printf("%0.2f Key %s\n",
glfwGetTime(),
action == GLFW_PRESS ? "pressed" : "released");
@ -67,12 +69,15 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
{
case GLFW_KEY_I:
glfwIconifyWindow(window);
iconified = window;
break;
case GLFW_KEY_M:
glfwMaximizeWindow(window);
break;
case GLFW_KEY_R:
if (iconified) window = iconified;
glfwRestoreWindow(window);
iconified = NULL;
break;
case GLFW_KEY_ESCAPE:
glfwSetWindowShouldClose(window, GLFW_TRUE);
@ -253,9 +258,10 @@ int main(int argc, char** argv)
if (fullscreen)
monitor = glfwGetPrimaryMonitor();
window_count = 1;
window_count = 2;
windows = calloc(window_count, sizeof(GLFWwindow*));
windows[0] = create_window(monitor);
windows[1] = create_window(monitor);
}
for (i = 0; i < window_count; i++)