From 24669fb6afe401a8dadccce4bb6a4e89a763daf0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 11 Jan 2019 14:20:26 +0530
Subject: [PATCH] Port a couple of fixes from upstream

https://github.com/glfw/glfw/commit/72c3908e1474d0cd72bed9fecb6ff3da022f7200
https://github.com/glfw/glfw/commit/cde0aaaab1e3610b6c8f27cd9a5f57f011a31b7d
---
 glfw/x11_window.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/glfw/x11_window.c b/glfw/x11_window.c
index db7565827..6269482c2 100644
--- a/glfw/x11_window.c
+++ b/glfw/x11_window.c
@@ -2244,10 +2244,14 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
         }
         else
         {
+            if (!window->resizable)
+                updateNormalHints(window, width, height);
+
             XMoveResizeWindow(_glfw.x11.display, window->x11.handle,
                               xpos, ypos, width, height);
         }
 
+        XFlush(_glfw.x11.display);
         return;
     }