Revision: 14859
http://sourceforge.net/p/skim-app/code/14859
Author: hofman
Date: 2025-01-11 17:21:50 +0000 (Sat, 11 Jan 2025)
Log Message:
-----------
pass mouse down event to dragging session method
Modified Paths:
--------------
trunk/SKColorSwatch.m
trunk/SKDragImageView.m
trunk/SKLineWell.m
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2025-01-09 22:28:12 UTC (rev 14858)
+++ trunk/SKColorSwatch.m 2025-01-11 17:21:50 UTC (rev 14859)
@@ -353,6 +353,7 @@
if ([self isEnabled])
[[itemViews objectAtIndex:i] setHighlighted:YES];
+ NSEvent *downEvent = theEvent;
BOOL keepOn = YES;
while (keepOn) {
theEvent = [[self window] nextEventMatchingMask:
NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged];
@@ -365,6 +366,7 @@
draggedIndex = i;
NSColor *color = [colors objectAtIndex:i];
+
CGFloat r = 1.5;
if (@available(macOS 11.0, *))
r = 2.5;
@@ -380,7 +382,7 @@
NSDraggingItem *dragItem = [[NSDraggingItem alloc]
initWithPasteboardWriter:color];
[dragItem setDraggingFrame:rect contents:image];
- [self beginDraggingSessionWithItems:@[dragItem]
event:theEvent source:self];
+ [self beginDraggingSessionWithItems:@[dragItem]
event:downEvent source:self];
keepOn = NO;
break;
Modified: trunk/SKDragImageView.m
===================================================================
--- trunk/SKDragImageView.m 2025-01-09 22:28:12 UTC (rev 14858)
+++ trunk/SKDragImageView.m 2025-01-11 17:21:50 UTC (rev 14859)
@@ -144,6 +144,7 @@
return;
}
+ NSEvent *downEvent = theEvent;
BOOL keepOn = YES;
BOOL isInside = YES;
NSPoint mouseLoc;
@@ -165,7 +166,7 @@
NSDraggingItem *dragItem = [[NSDraggingItem alloc]
initWithPasteboardWriter:object];
[dragItem setDraggingFrame:bounds contents:dragImage];
- [self beginDraggingSessionWithItems:@[dragItem]
event:theEvent source:self];
+ [self beginDraggingSessionWithItems:@[dragItem]
event:downEvent source:self];
}
keepOn = NO;
break;
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2025-01-09 22:28:12 UTC (rev 14858)
+++ trunk/SKLineWell.m 2025-01-11 17:21:50 UTC (rev 14859)
@@ -330,6 +330,7 @@
if ([self isEnabled]) {
[self setHighlighted:YES];
[self setNeedsDisplay:YES];
+ NSEvent *downEvent = theEvent;
NSUInteger modifiers = [theEvent modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask;
theEvent = [[self window] nextEventMatchingMask:
NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged];
[self setHighlighted:NO];
@@ -347,7 +348,7 @@
NSDraggingItem *dragItem = [[NSDraggingItem alloc]
initWithPasteboardWriter:item];
[dragItem setDraggingFrame:[self bounds] contents:[self
dragImage]];
- [self beginDraggingSessionWithItems:@[dragItem] event:theEvent
source:self];
+ [self beginDraggingSessionWithItems:@[dragItem] event:downEvent
source:self];
} else if ([self isActive]) {
[self deactivate];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
