From 83adcb9d38930bb4dffab680aabe806ec3a8d5c1 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 15 Aug 2024 13:27:37 -0700 Subject: [PATCH] Added SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER This is undocumented since the individual flags are separate window creation properties, but it's useful to have a shared definition for this, which is used internally and for migrating code from SDL2. --- include/SDL3/SDL_video.h | 1 + src/test/SDL_test_common.c | 2 +- src/video/SDL_video.c | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h index 1e57dbe48a..6fe65080a9 100644 --- a/include/SDL3/SDL_video.h +++ b/include/SDL3/SDL_video.h @@ -1057,6 +1057,7 @@ extern SDL_DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowWithProperties(SDL_Prop #define SDL_PROP_WINDOW_CREATE_BORDERLESS_BOOLEAN "SDL.window.create.borderless" #define SDL_PROP_WINDOW_CREATE_FOCUSABLE_BOOLEAN "SDL.window.create.focusable" #define SDL_PROP_WINDOW_CREATE_EXTERNAL_GRAPHICS_CONTEXT_BOOLEAN "SDL.window.create.external_graphics_context" +#define SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER "SDL.window.create.flags" #define SDL_PROP_WINDOW_CREATE_FULLSCREEN_BOOLEAN "SDL.window.create.fullscreen" #define SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER "SDL.window.create.height" #define SDL_PROP_WINDOW_CREATE_HIDDEN_BOOLEAN "SDL.window.create.hidden" diff --git a/src/test/SDL_test_common.c b/src/test/SDL_test_common.c index 899e5ae9a7..a2efb9f7a7 100644 --- a/src/test/SDL_test_common.c +++ b/src/test/SDL_test_common.c @@ -1369,7 +1369,7 @@ SDL_bool SDLTest_CommonInit(SDLTest_CommonState *state) SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_Y_NUMBER, r.y); SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, r.w); SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, r.h); - SDL_SetNumberProperty(props, "SDL.window.create.flags", state->window_flags); + SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER, state->window_flags); state->windows[i] = SDL_CreateWindowWithProperties(props); SDL_DestroyProperties(props); if (!state->windows[i]) { diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 4609efda63..aed4af1a5c 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -2232,7 +2232,7 @@ static struct { static SDL_WindowFlags SDL_GetWindowFlagProperties(SDL_PropertiesID props) { unsigned i; - SDL_WindowFlags flags = (SDL_WindowFlags)SDL_GetNumberProperty(props, "SDL.window.create.flags", 0); + SDL_WindowFlags flags = (SDL_WindowFlags)SDL_GetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER, 0); for (i = 0; i < SDL_arraysize(SDL_WindowFlagProperties); ++i) { if (SDL_WindowFlagProperties[i].invert_value) { @@ -2486,7 +2486,7 @@ SDL_Window *SDL_CreateWindow(const char *title, int w, int h, SDL_WindowFlags fl } SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, w); SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, h); - SDL_SetNumberProperty(props, "SDL.window.create.flags", flags); + SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER, flags); window = SDL_CreateWindowWithProperties(props); SDL_DestroyProperties(props); return window; @@ -2508,7 +2508,7 @@ SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_Y_NUMBER, offset_y); SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_WIDTH_NUMBER, w); SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_HEIGHT_NUMBER, h); - SDL_SetNumberProperty(props, "SDL.window.create.flags", flags); + SDL_SetNumberProperty(props, SDL_PROP_WINDOW_CREATE_FLAGS_NUMBER, flags); window = SDL_CreateWindowWithProperties(props); SDL_DestroyProperties(props); return window;