Revision: 6971
http://skim-app.svn.sourceforge.net/skim-app/?rev=6971&view=rev
Author: hofman
Date: 2010-12-13 15:48:15 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
combine conditions, so we don't need to check the next event twice
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-12-13 13:16:03 UTC (rev 6970)
+++ trunk/SKPDFView.m 2010-12-13 15:48:15 UTC (rev 6971)
@@ -3190,11 +3190,10 @@
newActiveAnnotation = activeAnnotation;
mouseDownInAnnotation = YES;
}
- } else if ([newActiveAnnotation isMarkup] && NSLeftMouseDragged ==
[[NSApp nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)
untilDate:[NSDate distantFuture] inMode:NSEventTrackingRunLoopMode dequeue:NO]
type]) {
- newActiveAnnotation = nil;
- mouseDownInAnnotation = YES;
- } else if (toolMode == SKNoteToolMode && annotationMode == SKInkNote
&& ([theEvent modifierFlags] & NSShiftKeyMask) == 0 && newActiveAnnotation &&
newActiveAnnotation != activeAnnotation &&
+ } else if (([newActiveAnnotation isMarkup] ||
+ (toolMode == SKNoteToolMode && annotationMode == SKInkNote
&& newActiveAnnotation && newActiveAnnotation != activeAnnotation)) &&
NSLeftMouseDragged == [[NSApp
nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)
untilDate:[NSDate distantFuture] inMode:NSEventTrackingRunLoopMode dequeue:NO]
type]) {
+ // don't drag markup notes or in freehand tool mode, unless the
note was previously selected, so we can select text or draw freehand strokes
newActiveAnnotation = nil;
mouseDownInAnnotation = YES;
} else if (([theEvent modifierFlags] & NSShiftKeyMask) &&
[activeAnnotation isEqual:newActiveAnnotation] == NO && [[activeAnnotation
page] isEqual:[newActiveAnnotation page]] && [[activeAnnotation type]
isEqualToString:[newActiveAnnotation type]]) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit