Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 07:40:22 +01:00
Code Releases Wiki Activity

Backends: SDL3: Fix macOS mouse position incorrect for fullscreen apps

Browse Source 
This commit fixes an issue with macOS on devices with a notch. SDL3
no longer provides a client area that encompasses the notch, so any
reporting of the mouse location must factor this in for fullscreen
SDL3 apps on macOS. SDL3 developers suggested using SDL_GetMouseState()
to retrieve the correct location until they can find a solution for
rendering into the notch area.
This commit is contained in:
Matt Guerrette 2024-08-25 21:44:39 -04:00
parent 864a2bf6b8
commit 441d54f7f7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backends/imgui_impl_sdl3.cpp
View File

@ -582,6 +582,21 @@ static void ImGui_ImplSDL3_UpdateMouseData()
float mouse_x_global, mouse_y_global; float mouse_x_global, mouse_y_global;
int window_x, window_y; int window_x, window_y;
SDL_GetGlobalMouseState(&mouse_x_global, &mouse_y_global); SDL_GetGlobalMouseState(&mouse_x_global, &mouse_y_global);
#if defined(SDL_PLATFORM_MACOS)
// On macOS SDL3 no longer renders fullscreen windows into the notch area
// on devices with such hardware, but will still report the global mouse state relative
// to the entire display.
// This results in incorrect mouse location data, as the mouse should be reported
// relative to the drawable client area.
// To resolve this issue, SDL_GetMouseState() can be used.
uint32_t window_flags = SDL_GetWindowFlags(bd->Window);
if (window_flags & SDL_WINDOW_FULLSCREEN)
{
SDL_GetMouseState(&mouse_x_global, &mouse_y_global);
}
#endif
SDL_GetWindowPosition(focused_window, &window_x, &window_y); SDL_GetWindowPosition(focused_window, &window_x, &window_y);
io.AddMousePosEvent(mouse_x_global - window_x, mouse_y_global - window_y); io.AddMousePosEvent(mouse_x_global - window_x, mouse_y_global - window_y);
} }