Skip to content

Commit

Permalink
Enable the SDL_HINT_MOUSE_DOUBLE_CLICK_TIME and SDL_HINT_MOUSE_DOUBLE…
Browse files Browse the repository at this point in the history
…_CLICK_RADIUS hints on macOS

Fixes #4000
  • Loading branch information
slouken committed Dec 7, 2024
1 parent 6d1dac1 commit 900627f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/video/cocoa/SDL_cocoawindow.m
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ - (BOOL)processHitTest:(NSEvent *)theEvent
static void Cocoa_SendMouseButtonClicks(SDL_Mouse *mouse, NSEvent *theEvent, SDL_Window *window, Uint8 button, bool down)
{
SDL_MouseID mouseID = SDL_DEFAULT_MOUSE_ID;
const int clicks = (int)[theEvent clickCount];
//const int clicks = (int)[theEvent clickCount];
SDL_Window *focus = SDL_GetKeyboardFocus();

// macOS will send non-left clicks to background windows without raising them, so we need to
Expand All @@ -1565,14 +1565,16 @@ static void Cocoa_SendMouseButtonClicks(SDL_Mouse *mouse, NSEvent *theEvent, SDL
// event for the background window, this just makes sure the button is reported at the
// correct position in its own event.
if (focus && ([theEvent window] == ((__bridge SDL_CocoaWindowData *)focus->internal).nswindow)) {
SDL_SendMouseButtonClicks(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down, clicks);
//SDL_SendMouseButtonClicks(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down, clicks);
SDL_SendMouseButton(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down);
} else {
const float orig_x = mouse->x;
const float orig_y = mouse->y;
const NSPoint point = [theEvent locationInWindow];
mouse->x = (int)point.x;
mouse->y = (int)(window->h - point.y);
SDL_SendMouseButtonClicks(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down, clicks);
//SDL_SendMouseButtonClicks(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down, clicks);
SDL_SendMouseButton(Cocoa_GetEventTimestamp([theEvent timestamp]), window, mouseID, button, down);
mouse->x = orig_x;
mouse->y = orig_y;
}
Expand Down
2 changes: 2 additions & 0 deletions test/testwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ int main(int argc, char *argv[])
SDL_RenderClear(renderer);
}

SDL_StopTextInput(state->windows[0]);
SDL_StopTextInput(state->windows[0]);
/* Main render loop */
done = 0;
#ifdef SDL_PLATFORM_EMSCRIPTEN
Expand Down

0 comments on commit 900627f

Please sign in to comment.