Skip to content

cocoa: Fix macOS 26 popup window regression in 3.4.14 #16153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlanday wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −5
Open

cocoa: Fix macOS 26 popup window regression in 3.4.14 #16153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/video/cocoa/SDL_cocoawindow.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,11 +1927,18 @@ - (void)mouseMoved:(NSEvent *)theEvent
if (@available(macOS 26.0, *)) {
// do for all windows for now, not just fullscreen spaces. And hopefully remove this code entirely soon.
//if ([_data.listener isInFullscreenSpace]) {
int posx = 0, posy = 0;
SDL_GetWindowPosition(window, &posx, &posy);
SDL_GetGlobalMouseState(&x, &y);
x -= posx;
y -= posy;
int windowRelativePosX = 0, windowRelativePosY = 0;
// If window is a popup, these coordinates are relative to the parent window.
SDL_GetWindowPosition(window, &windowRelativePosX, &windowRelativePosY);

int windowGlobalPosX = 0, windowGlobalPosY = 0;
// For the popup case
SDL_RelativeToGlobalForWindow(window, windowRelativePosX, windowRelativePosY, &windowGlobalPosX, &windowGlobalPosY);

float globalMouseX = 0.0f, globalMouseY = 0.0f;
SDL_GetGlobalMouseState(&globalMouseX, &globalMouseY);
x = globalMouseX - windowGlobalPosX;
y = globalMouseY - windowGlobalPosY;
//}
}

Expand Down