fix window flags order (#3114)
This commit is contained in:
parent
a0a18384cb
commit
2209e5b0ca
14
src/rcore.c
14
src/rcore.c
|
|
@ -1492,13 +1492,6 @@ void ClearWindowState(unsigned int flags)
|
||||||
CORE.Window.flags &= ~FLAG_WINDOW_RESIZABLE;
|
CORE.Window.flags &= ~FLAG_WINDOW_RESIZABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// State change: FLAG_WINDOW_UNDECORATED
|
|
||||||
if (((CORE.Window.flags & FLAG_WINDOW_UNDECORATED) > 0) && ((flags & FLAG_WINDOW_UNDECORATED) > 0))
|
|
||||||
{
|
|
||||||
glfwSetWindowAttrib(CORE.Window.handle, GLFW_DECORATED, GLFW_TRUE);
|
|
||||||
CORE.Window.flags &= ~FLAG_WINDOW_UNDECORATED;
|
|
||||||
}
|
|
||||||
|
|
||||||
// State change: FLAG_WINDOW_HIDDEN
|
// State change: FLAG_WINDOW_HIDDEN
|
||||||
if (((CORE.Window.flags & FLAG_WINDOW_HIDDEN) > 0) && ((flags & FLAG_WINDOW_HIDDEN) > 0))
|
if (((CORE.Window.flags & FLAG_WINDOW_HIDDEN) > 0) && ((flags & FLAG_WINDOW_HIDDEN) > 0))
|
||||||
{
|
{
|
||||||
|
|
@ -1518,6 +1511,13 @@ void ClearWindowState(unsigned int flags)
|
||||||
RestoreWindow(); // NOTE: Window state flag updated inside function
|
RestoreWindow(); // NOTE: Window state flag updated inside function
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// State change: FLAG_WINDOW_UNDECORATED
|
||||||
|
if (((CORE.Window.flags & FLAG_WINDOW_UNDECORATED) > 0) && ((flags & FLAG_WINDOW_UNDECORATED) > 0))
|
||||||
|
{
|
||||||
|
glfwSetWindowAttrib(CORE.Window.handle, GLFW_DECORATED, GLFW_TRUE);
|
||||||
|
CORE.Window.flags &= ~FLAG_WINDOW_UNDECORATED;
|
||||||
|
}
|
||||||
|
|
||||||
// State change: FLAG_WINDOW_UNFOCUSED
|
// State change: FLAG_WINDOW_UNFOCUSED
|
||||||
if (((CORE.Window.flags & FLAG_WINDOW_UNFOCUSED) > 0) && ((flags & FLAG_WINDOW_UNFOCUSED) > 0))
|
if (((CORE.Window.flags & FLAG_WINDOW_UNFOCUSED) > 0) && ((flags & FLAG_WINDOW_UNFOCUSED) > 0))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user