From a19490c29146d3bf8fd25e58801c8461edfcf478 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@glfw.org>
Date: Fri, 22 Jul 2016 17:39:39 +0200
Subject: [PATCH] Cleanup

Cleanup of a42d27011b3ef1e6229a1b83aaa075727a5521f3.
---
 README.md        |  6 +++---
 src/x11_window.c | 16 ++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 27d10813..a28b575e 100644
--- a/README.md
+++ b/README.md
@@ -101,12 +101,12 @@ information on what to include when reporting a bug.
                    `linmath.h` (#785)
  - [Win32] Bugfix: The first shown window ignored the `GLFW_MAXIMIZED` hint
                    when the process was provided a `STARTUPINFO` (#780)
+ - [X11] Bugfix: Window size limits were ignored if the minimum or maximum size
+                 was set to `GLFW_DONT_CARE` (#805)
  - [WGL] Added reporting of errors from `WGL_ARB_create_context` extension
  - [GLX] Bugfix: Dynamically loaded entry points were not verified
  - [EGL] Added `lib` prefix matching between EGL and OpenGL ES library binaries
  - [EGL] Bugfix: Dynamically loaded entry points were not verified
- - [X11] Bugfix: Fixed window size limits being ignored if window minimums or
-                 maximums were set to GLFW_DONT_CARE
 
 
 ## Contact
@@ -167,6 +167,7 @@ skills.
  - heromyth
  - Lucas Hinderberger
  - Paul Holden
+ - Warren Hu
  - IntellectualKitty
  - Aaron Jacobs
  - Toni Jovanoski
@@ -246,7 +247,6 @@ skills.
  - Santi Zupancic
  - Jonas Ådahl
  - Lasse Öörni
- - Warren Hu
  - All the unmentioned and anonymous contributors in the GLFW community, for bug
    reports, patches, feedback, testing and encouragement
 
diff --git a/src/x11_window.c b/src/x11_window.c
index ee745a81..3a76c13a 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -217,22 +217,10 @@ static void updateNormalHints(_GLFWwindow* window, int width, int height)
     {
         if (window->resizable)
         {
-            if (window->minwidth != GLFW_DONT_CARE &&
-                window->minheight != GLFW_DONT_CARE &&
-                window->maxwidth != GLFW_DONT_CARE &&
-                window->maxheight != GLFW_DONT_CARE)
-            {
-                hints->flags |= (PMinSize | PMaxSize);
-                hints->min_width  = window->minwidth;
-                hints->min_height = window->minheight;
-                hints->max_width  = window->maxwidth;
-                hints->max_height = window->maxheight;
-            }
-
             if (window->minwidth != GLFW_DONT_CARE &&
                 window->minheight != GLFW_DONT_CARE)
             {
-                hints->flags |= (PMinSize);
+                hints->flags |= PMinSize;
                 hints->min_width = window->minwidth;
                 hints->min_height = window->minheight;
             }
@@ -240,7 +228,7 @@ static void updateNormalHints(_GLFWwindow* window, int width, int height)
             if (window->maxwidth != GLFW_DONT_CARE &&
                 window->maxheight != GLFW_DONT_CARE)
             {
-                hints->flags |= (PMaxSize);
+                hints->flags |= PMaxSize;
                 hints->max_width = window->maxwidth;
                 hints->max_height = window->maxheight;
             }