Skip to content

Commit 3cf3b30

Browse files
committed
REVIEWED: Flags set/clear #5169
1 parent 5fbf67a commit 3cf3b30

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

src/platforms/rcore_desktop_glfw.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,15 +1854,15 @@ static void WindowIconifyCallback(GLFWwindow *window, int iconified)
18541854
// GLFW3 WindowMaximize Callback, runs when window is maximized/restored
18551855
static void WindowMaximizeCallback(GLFWwindow *window, int maximized)
18561856
{
1857-
if (maximized) FLAG_SET(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED); // The window was maximized
1858-
else FLAG_CLEAR(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED); // The window was restored
1857+
if (maximized) FLAG_SET(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED); // The window was maximized
1858+
else FLAG_CLEAR(CORE.Window.flags, FLAG_WINDOW_MAXIMIZED); // The window was restored
18591859
}
18601860

18611861
// GLFW3 WindowFocus Callback, runs when window get/lose focus
18621862
static void WindowFocusCallback(GLFWwindow *window, int focused)
18631863
{
1864-
if (focused) FLAG_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED); // The window was maximized
1865-
else FLAG_CLEAR(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED); // The window was restored
1864+
if (focused) FLAG_SET(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED); // The window was focused
1865+
else FLAG_CLEAR(CORE.Window.flags, FLAG_WINDOW_UNFOCUSED); // The window lost focus
18661866
}
18671867

18681868
// GLFW3 Window Drop Callback, runs when drop files into window

src/platforms/rcore_desktop_rgfw.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@ void SetWindowState(unsigned int flags)
423423
{
424424
RGFW_window_setFloating(platform.window, RGFW_TRUE);
425425
}
426+
if (FLAG_IS_SET(flags, FLAG_WINDOW_ALWAYS_RUN))
427+
{
428+
FLAG_SET(CORE.Window.flags, FLAG_WINDOW_ALWAYS_RUN);
429+
}
426430
if (FLAG_IS_SET(flags, FLAG_WINDOW_TRANSPARENT))
427431
{
428432
TRACELOG(LOG_WARNING, "WINDOW: Framebuffer transparency can only be configured before window initialization");

src/platforms/rcore_desktop_sdl.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,6 +588,10 @@ void SetWindowState(unsigned int flags)
588588
{
589589
SDL_SetWindowAlwaysOnTop(platform.window, SDL_FALSE);
590590
}
591+
if (FLAG_IS_SET(flags, FLAG_WINDOW_ALWAYS_RUN)
592+
{
593+
FLAG_SET(CORE.Window.flags, FLAG_WINDOW_ALWAYS_RUN);
594+
}
591595
if (FLAG_IS_SET(flags, FLAG_WINDOW_TRANSPARENT))
592596
{
593597
TRACELOG(LOG_WARNING, "SetWindowState() - FLAG_WINDOW_TRANSPARENT is not supported on PLATFORM_DESKTOP_SDL");
@@ -1933,7 +1937,7 @@ int InitPlatform(void)
19331937
FLAG_SET(flags, SDL_WINDOW_FULLSCREEN);
19341938
}
19351939

1936-
//if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIDDEN)) FLAG_SET(flags, SDL_WINDOW_HIDDEN);
1940+
//if (!FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIDDEN)) FLAG_SET(flags, SDL_WINDOW_HIDDEN);
19371941
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_UNDECORATED)) FLAG_SET(flags, SDL_WINDOW_BORDERLESS);
19381942
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_RESIZABLE)) FLAG_SET(flags, SDL_WINDOW_RESIZABLE);
19391943
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_MINIMIZED)) FLAG_SET(flags, SDL_WINDOW_MINIMIZED);
@@ -1943,9 +1947,9 @@ int InitPlatform(void)
19431947
FLAG_CLEAR(flags, SDL_WINDOW_INPUT_FOCUS);
19441948
FLAG_CLEAR(flags, SDL_WINDOW_MOUSE_FOCUS);
19451949
}
1946-
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_TOPMOST)) FLAG_SET(flags, SDL_WINDOW_ALWAYS_ON_TOP);
1950+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_TOPMOST)) FLAG_SET(flags, SDL_WINDOW_ALWAYS_ON_TOP);
19471951
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_MOUSE_PASSTHROUGH)) FLAG_CLEAR(flags, SDL_WINDOW_MOUSE_CAPTURE);
1948-
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI)) FLAG_SET(flags, SDL_WINDOW_ALLOW_HIGHDPI);
1952+
if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI)) FLAG_SET(flags, SDL_WINDOW_ALLOW_HIGHDPI);
19491953

19501954
//if (FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_TRANSPARENT)) FLAG_SET(flags, SDL_WINDOW_TRANSPARENT); // Alternative: SDL_GL_ALPHA_SIZE = 8
19511955
//if (FLAG_IS_SET(CORE.Window.flags, FLAG_FULLSCREEN_DESKTOP)) FLAG_SET(flags, SDL_WINDOW_FULLSCREEN_DESKTOP);

src/platforms/rcore_desktop_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ static DWORD MakeWindowStyle(unsigned flags)
271271

272272
// Minimized takes precedence over maximized
273273
int mized = MIZED_NONE;
274-
if (FLAG_CHECK(flags, FLAG_WINDOW_MINIMIZED)) mized = MIZED_MIN;
274+
if (FLAG_IS_SET(flags, FLAG_WINDOW_MINIMIZED)) mized = MIZED_MIN;
275275
if (flags & FLAG_WINDOW_MAXIMIZED) mized = MIZED_MAX;
276276

277277
switch (mized)

0 commit comments

Comments
 (0)