From 56cf8ef50c2ee50666615550f570e1b5fccb2f37 Mon Sep 17 00:00:00 2001 From: Keringar Date: Wed, 13 Jul 2016 14:31:51 -0700 Subject: [PATCH 1/3] Fixing resize issue on X11 --- src/x11_window.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/x11_window.c b/src/x11_window.c index 1bcab263d..644521c73 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -229,6 +229,22 @@ static void updateNormalHints(_GLFWwindow* window, int width, int height) hints->max_height = window->maxheight; } + if (window->minwidth != GLFW_DONT_CARE && + window->minheight != GLFW_DONT_CARE) + { + hints->flags |= (PMinSize); + hints->min_width = window->minwidth; + hints->min_height = window->minheight; + } + + if (window->maxwidth != GLFW_DONT_CARE && + window->maxheight != GLFW_DONT_CARE) + { + hints->flags |= (PMaxSize); + hints->max_width = window->maxwidth; + hints->max_height = window->maxheight; + } + if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE) { From 37c11a3de62a6e8b2a837420a4c26203741827fe Mon Sep 17 00:00:00 2001 From: Keringar Date: Wed, 13 Jul 2016 14:39:28 -0700 Subject: [PATCH 2/3] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6ce8543a0..0f6f821fe 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,8 @@ does not find Doxygen, the documentation will not be generated. when the process was provided a `STARTUPINFO` (#780) - [GLX] Bugfix: Dynamically loaded entry points were not verified - [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 From cdd23f03907037b7733b0796972dc8778f53266b Mon Sep 17 00:00:00 2001 From: Keringar Date: Wed, 13 Jul 2016 14:44:45 -0700 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0f6f821fe..7d93b0891 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ 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