[Skim-app-commit] SF.net SVN: skim-app:[12655] trunk/SKPDFView.m

[hofman--- via Skim-app-commit]

Revision: 12655
          http://sourceforge.net/p/skim-app/code/12655
Author:   hofman
Date:     2021-12-28 10:38:22 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
Don't reset temporary toolmode at beginning of mouseDown when we may perform it.

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2021-12-28 10:26:30 UTC (rev 12654)
+++ trunk/SKPDFView.m   2021-12-28 10:38:22 UTC (rev 12655)
@@ -1705,13 +1705,15 @@
        NSUInteger modifiers = [theEvent standardModifierFlags];
     PDFAreaOfInterest area = [self areaOfInterestForMouse:theEvent];
     PDFAnnotation *wasActiveAnnotation = activeAnnotation;
-    SKTemporaryToolMode tempToolMode = temporaryToolMode;
     
-    [self setTemporaryToolMode:SKNoToolMode];
+    if ((modifiers & NSCommandKeyMask) != 0)
+        [self setTemporaryToolMode:SKNoToolMode];
     
     if ([[self document] isLocked]) {
+        [self setTemporaryToolMode:SKNoToolMode];
         [super mouseDown:theEvent];
     } else if (interactionMode == SKPresentationMode) {
+        [self setTemporaryToolMode:SKNoToolMode];
         BOOL didHideMouse = pdfvFlags.cursorHidden;
         if (pdfvFlags.hideNotes == NO && [[self document] allowsNotes] && 
IS_TABLET_EVENT(theEvent, NSPenPointingDevice)) {
             [[NSCursor arrowCursor] set];
@@ -1718,6 +1720,7 @@
             [self doDrawFreehandNoteWithEvent:theEvent];
             [self setActiveAnnotation:nil];
         } else if ((area & kPDFLinkArea)) {
+            [self setTemporaryToolMode:SKNoToolMode];
             [super mouseDown:theEvent];
         } else if ([[self window] styleMask] != NSBorderlessWindowMask && 
[NSApp willDragMouse]) {
             [[NSCursor closedHandCursor] set];
@@ -1749,6 +1752,7 @@
         if (wantsLoupe)
             [self updateMagnifyWithEvent:nil];
     } else if ((area & SKReadingBarArea) && (area & kPDFLinkArea) == 0) {
+        [self setTemporaryToolMode:SKNoToolMode];
         BOOL wantsLoupe = [self hideLoupeWindow];
         if ((area & (SKResizeUpDownArea | SKResizeLeftRightArea)))
             [self doResizeReadingBarWithEvent:theEvent];
@@ -1758,20 +1762,18 @@
             [self updateMagnifyWithEvent:nil];
     } else if ((area & kPDFPageArea) == 0) {
         [self doDragWithEvent:theEvent];
-    } else if (tempToolMode == SKZoomToolMode && (modifiers & 
NSCommandKeyMask) == 0) {
+    } else if (temporaryToolMode == SKZoomToolMode && (modifiers & 
NSCommandKeyMask) == 0) {
         BOOL wantsLoupe = [self hideLoupeWindow];
-        [self setTemporaryToolMode:tempToolMode];
         [self doMarqueeZoomWithEvent:theEvent];
         [self setTemporaryToolMode:SKNoToolMode];
         if (wantsLoupe)
             [self updateMagnifyWithEvent:nil];
-    } else if (tempToolMode != SKNoToolMode && (modifiers & NSCommandKeyMask) 
== 0) {
+    } else if (temporaryToolMode != SKNoToolMode && (modifiers & 
NSCommandKeyMask) == 0) {
         [self setActiveAnnotation:nil];
-        [self setTemporaryToolMode:tempToolMode];
         [super mouseDown:theEvent];
         [self setTemporaryToolMode:SKNoToolMode];
         if ([[self currentSelection] hasCharacters]) {
-            [self addAnnotationWithType:(SKNoteType)tempToolMode];
+            [self addAnnotationWithType:(SKNoteType)temporaryToolMode];
             [self setCurrentSelection:nil];
         }
     } else if (toolMode == SKMoveToolMode) {

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