[Vm-dev] [commit][3711] JMM make osx drag and drop work again SQK-35
commits at squeakvm.org
commits at squeakvm.org
Wed May 11 18:05:54 UTC 2016
Revision: 3711
Author: johnmci
Date: 2016-05-11 11:05:53 -0700 (Wed, 11 May 2016)
Log Message:
-----------
JMM make osx drag and drop work again SQK-35
Modified Paths:
--------------
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h 2016-05-11 17:26:46 UTC (rev 3710)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXApplication+events.h 2016-05-11 18:05:53 UTC (rev 3711)
@@ -52,6 +52,6 @@
- (int) mapMouseAndModifierStateToSqueakBits: (NSEvent *) event;
- (NSUInteger) translateCocoaModifiersToCarbonModifiers: (NSUInteger) modifiers;
- (int) translateCocoaModifiersToSqueakModifiers: (NSUInteger) modifiers;
-- (void) recordDragEvent: (int) dragType numberOfFiles: (int) numFiles where: (NSPoint) local_point windowIndex: (sqInt) windowIndex;
+- (void) recordDragEvent: (int) dragType numberOfFiles: (int) numFiles where: (NSPoint) local_point windowIndex: (sqInt) windowIndex view:(NSView *)aView;
- (void) recordWindowEvent: (int) type window: (NSWIndow *) window;
@end
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2016-05-11 17:26:46 UTC (rev 3710)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXCGView.m 2016-05-11 18:05:53 UTC (rev 3711)
@@ -560,8 +560,8 @@
dragInProgress = YES;
self.dragCount = (int) [self countNumberOfNoneSqueakImageFilesInDraggedFiles: info];
- if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ if [(self.dragCount)
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex] view: self];
return NSDragOperationGeneric;
}
@@ -569,14 +569,14 @@
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
return NSDragOperationGeneric;
}
- (void) draggingExited: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
self.dragCount = 0;
self.dragInProgress = NO;
self.dragItems = NULL;
@@ -585,7 +585,7 @@
- (BOOL) performDragOperation: (id<NSDraggingInfo>)info {
if (self.dragCount) {
self.dragItems = [self filterOutSqueakImageFilesFromDraggedFiles: info];
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
}
NSArray *images = [self filterSqueakImageFilesFromDraggedFiles: info];
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-11 17:26:46 UTC (rev 3710)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2016-05-11 18:05:53 UTC (rev 3711)
@@ -643,7 +643,7 @@
self.dragCount = (int) [self countNumberOfNoneSqueakImageFilesInDraggedFiles: info];
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragEnter numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
return NSDragOperationGeneric;
}
@@ -651,14 +651,14 @@
- (NSDragOperation) draggingUpdated: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragMove numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
return NSDragOperationGeneric;
}
- (void) draggingExited: (id<NSDraggingInfo>)info
{
if (self.dragCount)
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragLeave numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
self.dragCount = 0;
self.dragInProgress = NO;
self.dragItems = NULL;
@@ -667,7 +667,7 @@
- (BOOL) performDragOperation: (id<NSDraggingInfo>)info {
if (self.dragCount) {
self.dragItems = [self filterOutSqueakImageFilesFromDraggedFiles: info];
- [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex];
+ [(sqSqueakOSXApplication *) gDelegateApp.squeakApplication recordDragEvent: DragDrop numberOfFiles: self.dragCount where: [info draggingLocation] windowIndex: self.windowLogic.windowIndex view: self];
}
NSArray *images = [self filterSqueakImageFilesFromDraggedFiles: info];
More information about the Vm-dev
mailing list