skim-app-commit Mailing List for Skim (Page 9)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 15590
          http://sourceforge.net/p/skim-app/code/15590
Author:   hofman
Date:     2025-07-03 09:13:55 +0000 (Thu, 03 Jul 2025)
Log Message:
-----------
move joining notes bby shift-mousedown to separate method

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

Modified: trunk/SKPDFView.m
===================================================================

--- trunk/SKPDFView.m	2025-07-02 16:23:14 UTC (rev 15589)
+++ trunk/SKPDFView.m	2025-07-03 09:13:55 UTC (rev 15590)
@@ -2398,6 +2398,58 @@
     [[self undoManager] setActionName:NSLocalizedString(@"Remove Note", @"Undo action name")];
 }
 
+- (PDFAnnotation *)joinAnnotationToCurrentAnnotation:(PDFAnnotation *)annotation {
+    PDFAnnotation *newAnnotation = nil;
+    PDFPage *page = [currentAnnotation page];
+    if ([currentAnnotation isMarkup]) {
+        NSString *type = [currentAnnotation type];
+        PDFSelection *sel = [currentAnnotation selection];
+        PDFSelection *newSel = [annotation selection];
+        BOOL copyText = [[NSUserDefaults standardUserDefaults] integerForKey:SKDisableUpdateContentsFromEnclosedTextKey] < 2;
+        NSString *string1 = [currentAnnotation string];
+        NSString *string2 = [annotation string];
+        NSString *string = nil;
+        if ([string1 length] > 0 && [string2 length] > 0) {
+            if ([sel safeIndexOfFirstCharacterOnPage:page] > (copyText ? [newSel safeIndexOfLastCharacterOnPage:page] : [newSel safeIndexOfFirstCharacterOnPage:page]))
+               string = [NSString stringWithFormat:@"%@ %@", string2, string1];
+            else if (copyText == NO || [newSel safeIndexOfFirstCharacterOnPage:page] > [sel safeIndexOfLastCharacterOnPage:page])
+                string = [NSString stringWithFormat:@"%@ %@", string1, string2];
+        }
+        [sel addSelection:newSel];
+        if (string == nil) {
+            if (copyText)
+                string = [sel cleanedString];
+            else if ([string1 length])
+                string = string1;
+            else if ([string2 length])
+                string = string2;
+        }
+        
+        newAnnotation = [PDFAnnotation newSkimNoteWithSelection:sel forType:type];
+        if ([string length] > 0)
+            [newAnnotation setString:string];
+    } else if ([currentAnnotation isInk]) {
+        NSMutableArray *paths = [[currentAnnotation pagePaths] mutableCopy];
+        [paths addObjectsFromArray:[annotation pagePaths]];
+        NSString *string1 = [currentAnnotation string];
+        NSString *string2 = [annotation string];
+        
+        newAnnotation = [PDFAnnotation newSkimNoteWithPaths:paths];
+        if ([string1 length] > 0 || [string2 length] > 0)
+            [newAnnotation setString:[string2 length] == 0 ? string1 : [string1 length] == 0 ? string2 : [NSString stringWithFormat:@"%@ %@", string1, string2]];
+        [newAnnotation setBorder:[currentAnnotation border]];
+    } else {
+        return nil;
+    }
+    [newAnnotation setColor:[currentAnnotation color]];
+    [newAnnotation registerUserName];
+    [[self document] removeAnnotation:currentAnnotation];
+    [[self document] removeAnnotation:annotation];
+    [[self document] addAnnotation:newAnnotation toPage:page];
+    [[self undoManager] setActionName:NSLocalizedString(@"Join Notes", @"Undo action name")];
+    return newAnnotation;
+}
+
 - (BOOL)addAnnotationWithType:(SKNoteType)annotationType selection:(PDFSelection *)selection page:(PDFPage *)page bounds:(NSRect)bounds {
     PDFAnnotation *newAnnotation = nil;
     NSArray *newAnnotations = nil;
@@ -3778,11 +3830,9 @@
     PDFPage *newActivePage = [self pageAndPoint:&point forEvent:theEvent nearest:YES];
     
     if (newActivePage) { // newActivePage should never be nil, but just to be sure
-        if (newActivePage != [currentAnnotation page]) {
+        if (newActivePage != [currentAnnotation page])
             // move the annotation to the new page
             [[self document] moveAnnotation:currentAnnotation toPage:newActivePage];
-            [[self undoManager] setActionName:NSLocalizedString(@"Edit Note", @"Undo action name")];
-        }
         
         NSRect newBounds = [currentAnnotation bounds];
         newBounds.origin = SKIntegralPoint(SKSubstractPoints(point, offset));
@@ -4173,54 +4223,7 @@
             // 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
             newCurrentAnnotation = nil;
         } else if ((modifiers & NSEventModifierFlagShift) && currentAnnotation != newCurrentAnnotation && [[currentAnnotation page] isEqual:[newCurrentAnnotation page]] && [[currentAnnotation type] isEqualToString:[newCurrentAnnotation type]]) {
-            PDFAnnotation *newAnnotation = nil;
-            if ([currentAnnotation isMarkup]) {
-                NSString *type = [currentAnnotation type];
-                PDFSelection *sel = [currentAnnotation selection];
-                PDFSelection *newSel = [newCurrentAnnotation selection];
-                BOOL copyText = [[NSUserDefaults standardUserDefaults] integerForKey:SKDisableUpdateContentsFromEnclosedTextKey] < 2;
-                NSString *string1 = [currentAnnotation string];
-                NSString *string2 = [newCurrentAnnotation string];
-                NSString *string = nil;
-                if ([string1 length] > 0 && [string2 length] > 0) {
-                    if ([sel safeIndexOfFirstCharacterOnPage:page] > (copyText ? [newSel safeIndexOfLastCharacterOnPage:page] : [newSel safeIndexOfFirstCharacterOnPage:page]))
-                       string = [NSString stringWithFormat:@"%@ %@", string2, string1];
-                    else if (copyText == NO || [newSel safeIndexOfFirstCharacterOnPage:page] > [sel safeIndexOfLastCharacterOnPage:page])
-                        string = [NSString stringWithFormat:@"%@ %@", string1, string2];
-                }
-                [sel addSelection:newSel];
-                if (string == nil) {
-                    if (copyText)
-                        string = [sel cleanedString];
-                    else if ([string1 length])
-                        string = string1;
-                    else if ([string2 length])
-                        string = string2;
-                }
-                
-                newAnnotation = [PDFAnnotation newSkimNoteWithSelection:sel forType:type];
-                if ([string length] > 0)
-                    [newAnnotation setString:string];
-            } else if ([currentAnnotation isInk]) {
-                NSMutableArray *paths = [[currentAnnotation pagePaths] mutableCopy];
-                [paths addObjectsFromArray:[newCurrentAnnotation pagePaths]];
-                NSString *string1 = [currentAnnotation string];
-                NSString *string2 = [newCurrentAnnotation string];
-                
-                newAnnotation = [PDFAnnotation newSkimNoteWithPaths:paths];
-                if ([string1 length] > 0 || [string2 length] > 0)
-                    [newAnnotation setString:[string2 length] == 0 ? string1 : [string1 length] == 0 ? string2 : [NSString stringWithFormat:@"%@ %@", string1, string2]];
-                [newAnnotation setBorder:[currentAnnotation border]];
-            }
-            if (newAnnotation) {
-                [newAnnotation setColor:[currentAnnotation color]];
-                [newAnnotation registerUserName];
-                [[self document] removeAnnotation:currentAnnotation];
-                [[self document] removeAnnotation:newCurrentAnnotation];
-                [[self document] addAnnotation:newAnnotation toPage:page];
-                [[self undoManager] setActionName:NSLocalizedString(@"Join Notes", @"Undo action name")];
-                newCurrentAnnotation = newAnnotation;
-            }
+            newCurrentAnnotation = [self joinAnnotationToCurrentAnnotation:newCurrentAnnotation] ?: newCurrentAnnotation;
         }
     }
     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2007	Jan	Feb	Mar (23)	Apr (254)	May (252)	Jun (209)	Jul (198)	Aug (192)	Sep (207)	Oct (120)	Nov (179)	Dec (52)
2008	Jan (48)	Feb (69)	Mar (129)	Apr (250)	May (113)	Jun (177)	Jul (228)	Aug (155)	Sep (218)	Oct (185)	Nov (109)	Dec (88)
2009	Jan (83)	Feb (39)	Mar (70)	Apr (47)	May (48)	Jun (67)	Jul (61)	Aug (97)	Sep (221)	Oct (141)	Nov (70)	Dec (61)
2010	Jan (45)	Feb (76)	Mar (178)	Apr (106)	May (57)	Jun (32)	Jul (64)	Aug (98)	Sep (96)	Oct (19)	Nov (34)	Dec (117)
2011	Jan (55)	Feb (48)	Mar (64)	Apr (21)	May (39)	Jun (53)	Jul (99)	Aug (56)	Sep (39)	Oct (26)	Nov (19)	Dec (69)
2012	Jan (17)	Feb (40)	Mar (17)	Apr	May (2)	Jun (8)	Jul (2)	Aug (10)	Sep (10)	Oct (38)	Nov (48)	Dec (70)
2013	Jan (43)	Feb (47)	Mar (39)	Apr (37)	May (25)	Jun (6)	Jul (20)	Aug (49)	Sep (33)	Oct (34)	Nov (75)	Dec (6)
2014	Jan (32)	Feb (10)	Mar (17)	Apr	May	Jun (26)	Jul (5)	Aug	Sep (4)	Oct (23)	Nov (80)	Dec (48)
2015	Jan (80)	Feb (50)	Mar (58)	Apr (20)	May (11)	Jun (16)	Jul (24)	Aug (27)	Sep (56)	Oct (30)	Nov (16)	Dec (6)
2016	Jan (31)	Feb (14)	Mar (23)	Apr (17)	May (40)	Jun (12)	Jul (17)	Aug (9)	Sep (32)	Oct (36)	Nov (23)	Dec (9)
2017	Jan (37)	Feb (23)	Mar (65)	Apr (22)	May (6)	Jun (3)	Jul	Aug	Sep (3)	Oct (22)	Nov (63)	Dec (71)
2018	Jan (83)	Feb (21)	Mar (35)	Apr (44)	May (14)	Jun (12)	Jul (8)	Aug (18)	Sep (10)	Oct (145)	Nov (144)	Dec (76)
2019	Jan (18)	Feb (28)	Mar (5)	Apr (208)	May (291)	Jun (158)	Jul (27)	Aug (8)	Sep (10)	Oct (83)	Nov (41)	Dec (31)
2020	Jan (16)	Feb (46)	Mar (100)	Apr (78)	May (69)	Jun (71)	Jul (28)	Aug (131)	Sep (176)	Oct (89)	Nov (147)	Dec (19)
2021	Jan (19)	Feb (25)	Mar (91)	Apr (98)	May (14)	Jun (44)	Jul (8)	Aug (3)	Sep (38)	Oct (57)	Nov (97)	Dec (74)
2022	Jan (89)	Feb (47)	Mar (15)	Apr (50)	May (54)	Jun (56)	Jul (80)	Aug (12)	Sep (11)	Oct (60)	Nov (48)	Dec (4)
2023	Jan (75)	Feb (49)	Mar (84)	Apr (24)	May (13)	Jun (74)	Jul (32)	Aug (66)	Sep (50)	Oct (38)	Nov (105)	Dec (181)
2024	Jan (21)	Feb (49)	Mar (77)	Apr (84)	May (20)	Jun (71)	Jul (53)	Aug (33)	Sep (54)	Oct (124)	Nov (151)	Dec (73)
2025	Jan (61)	Feb (17)	Mar (136)	Apr (72)	May (200)	Jun (238)	Jul (91)	Aug (8)	Sep	Oct (63)	Nov (52)	Dec

skim-app-commit Mailing List for Skim (Page 9)

A PDF Reader and Note-taker for OS X

skim-app-commit — This tracks source code changes in Subversion.