eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-29 16:09:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

SDL_GetWindowOpacity() directly returns the opacity instead of using an out parameter.

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/10286
This commit is contained in:
Sam Lantinga 2024-07-16 07:25:48 -07:00
parent 58270ef3f2
commit 027671bedb
5 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/README-migration.md
View file

@ -2050,9 +2050,10 @@ SDL_GL_GetDrawableSize() has been removed. SDL_GetWindowSizeInPixels() can be us
The SDL_WINDOW_TOOLTIP and SDL_WINDOW_POPUP_MENU window flags are now supported on Windows, Mac (Cocoa), X11, and Wayland. Creating windows with these flags must happen via the `SDL_CreatePopupWindow()` function. This function requires passing in the handle to a valid parent window for the popup, and the popup window is positioned relative to the parent. The SDL_WINDOW_TOOLTIP and SDL_WINDOW_POPUP_MENU window flags are now supported on Windows, Mac (Cocoa), X11, and Wayland. Creating windows with these flags must happen via the `SDL_CreatePopupWindow()` function. This function requires passing in the handle to a valid parent window for the popup, and the popup window is positioned relative to the parent.
SDL_WindowFlags is used instead of Uint32 for API functions that refer to window flags, and has been extended to 64 bits. SDL_WindowFlags is used instead of Uint32 for API functions that refer to window flags, and has been extended to 64 bits.
SDL_GetWindowOpacity() directly returns the opacity instead of using an out parameter.
The following functions have been renamed: The following functions have been renamed:
* SDL_GL_DeleteContext() => SDL_GL_DestroyContext() * SDL_GL_DeleteContext() => SDL_GL_DestroyContext()
* SDL_GetClosestDisplayMode() => SDL_GetClosestFullscreenDisplayMode() * SDL_GetClosestDisplayMode() => SDL_GetClosestFullscreenDisplayMode()

11
include/SDL3/SDL_video.h
View file

@ -2143,23 +2143,18 @@ extern SDL_DECLSPEC int SDLCALL SDL_SetWindowOpacity(SDL_Window *window, float o
/** /**
* Get the opacity of a window. * Get the opacity of a window.
* *
* If transparency isn't supported on this platform, opacity will be reported * If transparency isn't supported on this platform, opacity will be returned
* as 1.0f without error. * as 1.0f without error.
* *
* The parameter `opacity` is ignored if it is NULL.
*
* This function also returns -1 if an invalid window was provided.
*
* \param window the window to get the current opacity value from. * \param window the window to get the current opacity value from.
* \param out_opacity the float filled in (0.0f - transparent, 1.0f - opaque). * \returns the opacity, (0.0f - transparent, 1.0f - opaque), or a negative error code on failure; call
* \returns 0 on success or a negative error code on failure; call
* SDL_GetError() for more information. * SDL_GetError() for more information.
* *
* \since This function is available since SDL 3.0.0. * \since This function is available since SDL 3.0.0.
* *
* \sa SDL_SetWindowOpacity * \sa SDL_SetWindowOpacity
*/ */
extern SDL_DECLSPEC int SDLCALL SDL_GetWindowOpacity(SDL_Window *window, float *out_opacity); extern SDL_DECLSPEC float SDLCALL SDL_GetWindowOpacity(SDL_Window *window);
/** /**
* Set the window as a modal to a parent window. * Set the window as a modal to a parent window.

2
src/dynapi/SDL_dynapi_procs.h
View file

@ -520,7 +520,7 @@ SDL_DYNAPI_PROC(int,SDL_GetWindowMaximumSize,(SDL_Window *a, int *b, int *c),(a,
SDL_DYNAPI_PROC(int,SDL_GetWindowMinimumSize,(SDL_Window *a, int *b, int *c),(a,b,c),return) SDL_DYNAPI_PROC(int,SDL_GetWindowMinimumSize,(SDL_Window *a, int *b, int *c),(a,b,c),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_GetWindowMouseGrab,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_bool,SDL_GetWindowMouseGrab,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(const SDL_Rect*,SDL_GetWindowMouseRect,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(const SDL_Rect*,SDL_GetWindowMouseRect,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetWindowOpacity,(SDL_Window *a, float *b),(a,b),return) SDL_DYNAPI_PROC(float,SDL_GetWindowOpacity,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowParent,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_Window*,SDL_GetWindowParent,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(float,SDL_GetWindowPixelDensity,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(float,SDL_GetWindowPixelDensity,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(SDL_PixelFormat,SDL_GetWindowPixelFormat,(SDL_Window *a),(a),return) SDL_DYNAPI_PROC(SDL_PixelFormat,SDL_GetWindowPixelFormat,(SDL_Window *a),(a),return)

4
src/test/SDL_test_common.c
View file

@ -2216,8 +2216,7 @@ int SDLTest_CommonEventMainCallbacks(SDLTest_CommonState *state, const SDL_Event
/* Ctrl-O (or Ctrl-Shift-O) changes window opacity. */ /* Ctrl-O (or Ctrl-Shift-O) changes window opacity. */
SDL_Window *window = SDL_GetWindowFromID(event->key.windowID); SDL_Window *window = SDL_GetWindowFromID(event->key.windowID);
if (window) { if (window) {
float opacity; float opacity = SDL_GetWindowOpacity(window);
if (SDL_GetWindowOpacity(window, &opacity) == 0) {
if (withShift) { if (withShift) {
opacity += 0.20f; opacity += 0.20f;
} else { } else {
@ -2226,7 +2225,6 @@ int SDLTest_CommonEventMainCallbacks(SDLTest_CommonState *state, const SDL_Event
SDL_SetWindowOpacity(window, opacity); SDL_SetWindowOpacity(window, opacity);
} }
} }
}
break; break;
case SDLK_H: case SDLK_H:
if (withControl) { if (withControl) {

10
src/video/SDL_video.c
View file

@ -3504,15 +3504,11 @@ int SDL_SetWindowOpacity(SDL_Window *window, float opacity)
return retval; return retval;
} }
int SDL_GetWindowOpacity(SDL_Window *window, float *out_opacity) float SDL_GetWindowOpacity(SDL_Window *window)
{ {
CHECK_WINDOW_MAGIC(window, -1); CHECK_WINDOW_MAGIC(window, -1.0f);
if (out_opacity) { return window->opacity;
*out_opacity = window->opacity;
}
return 0;
} }
int SDL_SetWindowModalFor(SDL_Window *modal_window, SDL_Window *parent_window) int SDL_SetWindowModalFor(SDL_Window *modal_window, SDL_Window *parent_window)