eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't assert or change window draggable state if SDL isn't managing hit testing

Browse source 
Fixes an assert if the application has set up its own hit testing on macOS
This commit is contained in:
Sam Lantinga 2024-07-29 09:15:55 -07:00
parent 5318e30ee5
commit 5637cd009a
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/video/cocoa/SDL_cocoawindow.m
View file

@ -1526,8 +1526,6 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
{ {
SDL_Window *window = _data.window; SDL_Window *window = _data.window;
SDL_assert(isDragAreaRunning == [_data.nswindow isMovableByWindowBackground]);
if (window->hit_test) { /* if no hit-test, skip this. */ if (window->hit_test) { /* if no hit-test, skip this. */
const NSPoint location = [theEvent locationInWindow]; const NSPoint location = [theEvent locationInWindow];
const SDL_Point point = { (int)location.x, window->h - (((int)location.y) - 1) }; const SDL_Point point = { (int)location.x, window->h - (((int)location.y) - 1) };
@ -1538,15 +1536,15 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
[_data.nswindow setMovableByWindowBackground:YES]; [_data.nswindow setMovableByWindowBackground:YES];
} }
return YES; /* dragging! */ return YES; /* dragging! */
} else {
if (isDragAreaRunning) {
isDragAreaRunning = NO;
[_data.nswindow setMovableByWindowBackground:NO];
return YES; /* was dragging, drop event. */
}
} }
} }
if (isDragAreaRunning) {
isDragAreaRunning = NO;
[_data.nswindow setMovableByWindowBackground:NO];
return YES; /* was dragging, drop event. */
}
return NO; /* not a special area, carry on. */ return NO; /* not a special area, carry on. */
} }
@ -2381,16 +2379,16 @@ void Cocoa_SetWindowSize(SDL_VideoDevice *_this, SDL_Window *window)
/* isZoomed always returns true if the window is not resizable */ /* isZoomed always returns true if the window is not resizable */
if (!(window->flags & SDL_WINDOW_RESIZABLE) || !Cocoa_IsZoomed(window)) { if (!(window->flags & SDL_WINDOW_RESIZABLE) || !Cocoa_IsZoomed(window)) {
if (!(window->flags & SDL_WINDOW_FULLSCREEN)) { if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
int x, y; int x, y;
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
/* Cocoa will resize the window from the bottom-left rather than the /* Cocoa will resize the window from the bottom-left rather than the
* top-left when -[nswindow setContentSize:] is used, so we must set the * top-left when -[nswindow setContentSize:] is used, so we must set the
* entire frame based on the new size, in order to preserve the position. * entire frame based on the new size, in order to preserve the position.
*/ */
SDL_RelativeToGlobalForWindow(window, window->floating.x, window->floating.y, &x, &y); SDL_RelativeToGlobalForWindow(window, window->floating.x, window->floating.y, &x, &y);
rect.origin.x = x; rect.origin.x = x;
rect.origin.y = y; rect.origin.y = y;
rect.size.width = window->floating.w; rect.size.width = window->floating.w;
rect.size.height = window->floating.h; rect.size.height = window->floating.h;
ConvertNSRect(&rect); ConvertNSRect(&rect);