mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-09-19 21:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix application of window size limits

Browse Source 
Closes #805.
This commit is contained in:
Keringar 2016-07-13 14:31:51 -07:00 committed by Camilla Berglund
parent c844fea9df
commit d4eb88b255
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -105,6 +105,8 @@ information on what to include when reporting a bug.
- [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
@ -244,6 +246,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

16
src/x11_window.c
View File

@ -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)
{