Revision: 6969
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6969&view=rev
Author:   hofman
Date:     2010-12-13 13:12:46 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
Only select note in freehand note tool mode on a simple click, so that dragging 
the mouse will draw a new line by default. Moving and editing will need 
selecting first. When holding Shift or Option behaves as before, i.e. dragging. 
Also don't selected newly added freehand note, so drawing can proceed without 
risking a drag immediately.

Modified Paths:
--------------
    trunk/SKPDFView.m

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2010-12-13 12:55:41 UTC (rev 6968)
+++ trunk/SKPDFView.m   2010-12-13 13:12:46 UTC (rev 6969)
@@ -3193,6 +3193,10 @@
         } 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 && 
+                   NSLeftMouseDragged == [[NSApp 
nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask) 
untilDate:[NSDate distantFuture] inMode:NSEventTrackingRunLoopMode dequeue:NO] 
type]) {
+            newActiveAnnotation = nil;
+            mouseDownInAnnotation = YES;
         } else if (([theEvent modifierFlags] & NSShiftKeyMask) && 
[activeAnnotation isEqual:newActiveAnnotation] == NO && [[activeAnnotation 
page] isEqual:[newActiveAnnotation page]] && [[activeAnnotation type] 
isEqualToString:[newActiveAnnotation type]]) {
             if ([activeAnnotation isMarkup]) {
                 NSInteger markupType = [(PDFAnnotationMarkup 
*)activeAnnotation markupType];
@@ -3329,6 +3333,7 @@
                 [activeAnnotation setBorder:border];
                 [activeAnnotation setString:text];
             }
+            [self setActiveAnnotation:nil];
             [[self undoManager] setActionName:NSLocalizedString(@"Add Note", 
@"Undo action name")];
         }
     }


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

Reply via email to