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

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

Revision: 12652
          http://sourceforge.net/p/skim-app/code/12652
Author:   hofman
Date:     2021-12-28 00:15:39 +0000 (Tue, 28 Dec 2021)
Log Message:
-----------
Set temporary tool mode while performing it. Set default highlight color for 
selection in temporary highlight tool mode.

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2021-12-28 00:06:09 UTC (rev 12651)
+++ trunk/SKPDFView.m   2021-12-28 00:15:39 UTC (rev 12652)
@@ -884,7 +884,7 @@
 }
 
 - (void)setCurrentSelection:(PDFSelection *)selection {
-    if (toolMode == SKNoteToolMode && annotationMode == SKHighlightNote)
+    if ((toolMode == SKNoteToolMode && annotationMode == SKHighlightNote) || 
temporaryToolMode == SKHighlightToolMode)
         [selection setColor:[[NSUserDefaults standardUserDefaults] 
colorForKey:SKHighlightNoteColorKey]];
     [super setCurrentSelection:selection];
 }
@@ -1760,12 +1760,16 @@
         [self doDragWithEvent:theEvent];
     } else if (tempToolMode == SKZoomToolMode && modifiers == 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) {
         [self setActiveAnnotation:nil];
+        [self setTemporaryToolMode:tempToolMode];
         [super mouseDown:theEvent];
+        [self setTemporaryToolMode:SKNoToolMode];
         if ([[self currentSelection] hasCharacters]) {
             [self addAnnotationWithType:(SKNoteType)tempToolMode];
             [self setCurrentSelection:nil];

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