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

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

Revision: 15598
          http://sourceforge.net/p/skim-app/code/15598
Author:   hofman
Date:     2025-07-03 14:20:05 +0000 (Thu, 03 Jul 2025)
Log Message:
-----------
check for markup or ink beforre joining notes

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

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2025-07-03 14:14:44 UTC (rev 15597)
+++ trunk/SKPDFView.m   2025-07-03 14:20:05 UTC (rev 15598)
@@ -4227,7 +4227,7 @@
                    [NSApp willDragMouse]) {
             // 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
             return NO;
-        } else if ((modifiers & NSEventModifierFlagShift) && currentAnnotation 
!= newCurrentAnnotation && [currentAnnotation page] == page && 
[[currentAnnotation type] isEqualToString:[newCurrentAnnotation type]]) {
+        } else if ((modifiers & NSEventModifierFlagShift) && currentAnnotation 
!= newCurrentAnnotation && [currentAnnotation page] == page && 
[[currentAnnotation type] isEqualToString:[newCurrentAnnotation type]] && 
([currentAnnotation isMarkup] || [currentAnnotation isInk])) {
             newCurrentAnnotation = [self 
joinAnnotationToCurrentAnnotation:newCurrentAnnotation] ?: newCurrentAnnotation;
         }
     }

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