Revision: 7517
http://skim-app.svn.sourceforge.net/skim-app/?rev=7517&view=rev
Author: hofman
Date: 2011-10-14 22:21:37 +0000 (Fri, 14 Oct 2011)
Log Message:
-----------
Extend and select freehand notes also when CapsLock is pressed
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2011-10-13 11:41:50 UTC (rev 7516)
+++ trunk/SKPDFView.m 2011-10-14 22:21:37 UTC (rev 7517)
@@ -3331,7 +3331,7 @@
mouseDownInAnnotation = YES;
}
} else if (([newActiveAnnotation isMarkup] ||
- (isInk && newActiveAnnotation && (newActiveAnnotation !=
activeAnnotation || isShift))) &&
+ (isInk && newActiveAnnotation && (newActiveAnnotation !=
activeAnnotation || ([theEvent modifierFlags] & (NSShiftKeyMask |
NSAlphaShiftKeyMask))))) &&
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;
@@ -3385,7 +3385,7 @@
[bezierPath moveToPoint:[self convertPoint:mouseDownLoc toPage:page]];
[bezierPath setLineCapStyle:NSRoundLineCapStyle];
[bezierPath setLineJoinStyle:NSRoundLineJoinStyle];
- if (([theEvent modifierFlags] & NSShiftKeyMask) && [[activeAnnotation
type] isEqualToString:SKNInkString] && [[activeAnnotation page] isEqual:page]) {
+ if (([theEvent modifierFlags] & (NSShiftKeyMask | NSAlphaShiftKeyMask)) &&
[[activeAnnotation type] isEqualToString:SKNInkString] && [[activeAnnotation
page] isEqual:page]) {
pathColor = [[activeAnnotation color] retain];
[bezierPath setLineWidth:[activeAnnotation lineWidth]];
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5 &&
[activeAnnotation borderStyle] == kPDFBorderStyleDashed) {
@@ -3435,9 +3435,11 @@
if (activeAnnotation) {
[self removeActiveAnnotation:nil];
[self setActiveAnnotation:annotation];
- } else if ([theEvent modifierFlags] & NSShiftKeyMask) {
+ } else if ([theEvent modifierFlags] & (NSShiftKeyMask |
NSAlphaShiftKeyMask)) {
[self setActiveAnnotation:annotation];
}
+ } else if ([theEvent modifierFlags] & NSAlphaShiftKeyMask) {
+ [self setActiveAnnotation:nil];
}
SKDESTROY(bezierPath);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
