mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Place drag icon below cursor on macOS

Browse Source 
Fixes #9539
This commit is contained in:
copilot-swe-agent[bot]
2026-02-21 16:14:40 +00:00
committed by Kovid Goyal
parent 2e1e89f280
commit 56a9dd1bb7
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
glfw/cocoa_window.m
View File

@@ -3971,6 +3971,32 @@ _glfwPlatformStartDrag(_GLFWwindow* window, const GLFWimage* thumbnail) {@autore
[d end_transfer:EINVAL]; [d end_transfer:EINVAL];
} }
} }
// Obtain the event and view early so we can position the drag image relative to the cursor
NSEvent* event = [NSApp currentEvent];
if (!event || ([event type] != NSEventTypeLeftMouseDown &&
[event type] != NSEventTypeLeftMouseDragged)) {
// Create a synthetic left mouse down event using stored cursor position
// Convert window coordinates to screen coordinates
NSRect contentRect = [window->ns.view frame];
NSPoint windowPos = NSMakePoint(window->virtualCursorPosX,
contentRect.size.height - window->virtualCursorPosY);
event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown
location:windowPos
modifierFlags:0
timestamp:[[NSProcessInfo processInfo] systemUptime]
windowNumber:[window->ns.object windowNumber]
context:nil
eventNumber:0
clickCount:1
pressure:1.0];
}
if (!event) return EIO;
GLFWContentView *v = window->ns.view;
// Convert mouse position to view coordinates for drag image placement
NSPoint mouseInView = [v convertPoint:[event locationInWindow] fromView:nil];
NSMutableArray<NSDraggingItem*>* dragItems = [[[NSMutableArray alloc] init] autorelease]; NSMutableArray<NSDraggingItem*>* dragItems = [[[NSMutableArray alloc] init] autorelease];
for (size_t i = 0; i < _glfw.drag.item_count; i++) { for (size_t i = 0; i < _glfw.drag.item_count; i++) {
NSString* utiString = mime_to_uti(_glfw.drag.items[i].mime_type); NSString* utiString = mime_to_uti(_glfw.drag.items[i].mime_type);
@@ -4016,7 +4042,10 @@ _glfwPlatformStartDrag(_GLFWwindow* window, const GLFWimage* thumbnail) {@autore
NSImage* image = [[NSImage alloc] initWithSize: pointSize]; NSImage* image = [[NSImage alloc] initWithSize: pointSize];
if (image) { if (image) {
[image addRepresentation:imageRep]; [image addRepresentation:imageRep];
[dragItem setDraggingFrame:NSMakeRect(0, 0, image.size.width, image.size.height) contents:image]; // Place drag image below cursor and horizontally centered
CGFloat frameX = mouseInView.x - image.size.width / 2.0;
CGFloat frameY = mouseInView.y - image.size.height;
[dragItem setDraggingFrame:NSMakeRect(frameX, frameY, image.size.width, image.size.height) contents:image];
[image release]; [image release];
} }
[imageRep release]; [imageRep release];
@@ -4028,33 +4057,8 @@ _glfwPlatformStartDrag(_GLFWwindow* window, const GLFWimage* thumbnail) {@autore
[dragItems addObject:dragItem]; [dragItems addObject:dragItem];
} }
// Start the drag session - try current event first, then create a synthetic one [v beginDraggingSessionWithItems:dragItems event:event source:[v draggingSource]];
NSEvent* event = [NSApp currentEvent]; return 0;
if (!event || ([event type] != NSEventTypeLeftMouseDown &&
[event type] != NSEventTypeLeftMouseDragged)) {
// Create a synthetic left mouse down event using stored cursor position
// Convert window coordinates to screen coordinates
NSRect contentRect = [window->ns.view frame];
NSPoint windowPos = NSMakePoint(window->virtualCursorPosX,
contentRect.size.height - window->virtualCursorPosY);
event = [NSEvent mouseEventWithType:NSEventTypeLeftMouseDown
location:windowPos
modifierFlags:0
timestamp:[[NSProcessInfo processInfo] systemUptime]
windowNumber:[window->ns.object windowNumber]
context:nil
eventNumber:0
clickCount:1
pressure:1.0];
}
if (event) {
GLFWContentView *v = window->ns.view;
[v beginDraggingSessionWithItems:dragItems event:event source:[v draggingSource]];
return 0;
}
return EIO;
}} }}