mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Cleanup of a42d27011b3ef1e6229a1b83aaa075727a5521f3.
This commit is contained in:
Camilla Berglund 2016-07-22 17:39:39 +02:00
parent d4eb88b255
commit a19490c291
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -101,12 +101,12 @@ information on what to include when reporting a bug.
`linmath.h` (#785) `linmath.h` (#785)
- [Win32] Bugfix: The first shown window ignored the `GLFW_MAXIMIZED` hint - [Win32] Bugfix: The first shown window ignored the `GLFW_MAXIMIZED` hint
when the process was provided a `STARTUPINFO` (#780) 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 - [WGL] Added reporting of errors from `WGL_ARB_create_context` extension
- [GLX] Bugfix: Dynamically loaded entry points were not verified - [GLX] Bugfix: Dynamically loaded entry points were not verified
- [EGL] Added `lib` prefix matching between EGL and OpenGL ES library binaries - [EGL] Added `lib` prefix matching between EGL and OpenGL ES library binaries
- [EGL] 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 ## Contact
@ -167,6 +167,7 @@ skills.
- heromyth - heromyth
- Lucas Hinderberger - Lucas Hinderberger
- Paul Holden - Paul Holden
- Warren Hu
- IntellectualKitty - IntellectualKitty
- Aaron Jacobs - Aaron Jacobs
- Toni Jovanoski - Toni Jovanoski
@ -246,7 +247,6 @@ skills.
- Santi Zupancic - Santi Zupancic
- Jonas Ådahl - Jonas Ådahl
- Lasse Öörni - Lasse Öörni
- Warren Hu
- All the unmentioned and anonymous contributors in the GLFW community, for bug - All the unmentioned and anonymous contributors in the GLFW community, for bug
reports, patches, feedback, testing and encouragement reports, patches, feedback, testing and encouragement

16
src/x11_window.c
View File

@ -217,22 +217,10 @@ static void updateNormalHints(_GLFWwindow* window, int width, int height)
{ {
if (window->resizable) 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 && if (window->minwidth != GLFW_DONT_CARE &&
window->minheight != GLFW_DONT_CARE) window->minheight != GLFW_DONT_CARE)
{ {
hints->flags |= (PMinSize); hints->flags |= PMinSize;
hints->min_width = window->minwidth; hints->min_width = window->minwidth;
hints->min_height = window->minheight; hints->min_height = window->minheight;
} }
@ -240,7 +228,7 @@ static void updateNormalHints(_GLFWwindow* window, int width, int height)
if (window->maxwidth != GLFW_DONT_CARE && if (window->maxwidth != GLFW_DONT_CARE &&
window->maxheight != GLFW_DONT_CARE) window->maxheight != GLFW_DONT_CARE)
{ {
hints->flags |= (PMaxSize); hints->flags |= PMaxSize;
hints->max_width = window->maxwidth; hints->max_width = window->maxwidth;
hints->max_height = window->maxheight; hints->max_height = window->maxheight;
} }