[Skim-app-commit] SF.net SVN: skim-app:[14659] trunk/SKBookmarkControll er.m

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

Revision: 14659
          http://sourceforge.net/p/skim-app/code/14659
Author:   hofman
Date:     2024-11-07 17:42:09 +0000 (Thu, 07 Nov 2024)
Log Message:
-----------
Build current document items folder bookmark first

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

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2024-11-07 17:35:16 UTC (rev 14658)
+++ trunk/SKBookmarkController.m        2024-11-07 17:42:09 UTC (rev 14659)
@@ -659,10 +659,14 @@
                 [menu removeItemAtIndex:i];
             if (supermenu == [NSApp mainMenu]) {
                 NSURL *fileURL = [[[[NSApp mainWindow] windowController] 
document] fileURL];
-                NSArray *currentBookmarks = nil;
-                if (fileURL)
-                    currentBookmarks = [[[self bookmarkRoot] entireContents] 
filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"fileURL = %@", 
fileURL]];
-                if (previousSession || closedDocuments || [currentBookmarks 
count] > 1)
+                SKBookmark *currentDocument = nil;
+                if (fileURL) {
+                    NSArray *currentBookmarks = [[[self bookmarkRoot] 
entireContents] filteredArrayUsingPredicate:[NSPredicate 
predicateWithFormat:@"fileURL = %@", fileURL]];
+                    if ([currentBookmarks count] > 1) {
+                        currentDocument = [[SKBookmark alloc] 
initFolderWithChildren:[[NSArray alloc] initWithArray:currentBookmarks 
copyItems:YES] label:NSLocalizedString(@"Current Document", @"Menu item 
title")];
+                    }
+                }
+                if (previousSession || closedDocuments || currentDocument)
                     [menu addItem:[NSMenuItem separatorItem]];
                 if (previousSession) {
                     [self addItemForBookmark:previousSession toMenu:menu 
isFolder:NO isAlternate:NO];
@@ -672,9 +676,8 @@
                     [self addItemForBookmark:closedDocuments toMenu:menu 
isFolder:YES isAlternate:NO];
                     [self addItemForBookmark:closedDocuments toMenu:menu 
isFolder:NO isAlternate:YES];
                 }
-                if ([currentBookmarks count] > 1) {
-                    SKBookmark *folder = [[SKBookmark alloc] 
initFolderWithChildren:[[NSArray alloc] initWithArray:currentBookmarks 
copyItems:YES] label:NSLocalizedString(@"Current Document", @"Menu item 
title")];
-                    [self addItemForBookmark:folder toMenu:menu isFolder:YES 
isAlternate:NO];
+                if (currentDocument) {
+                    [self addItemForBookmark:currentDocument toMenu:menu 
isFolder:YES isAlternate:NO];
                 }
             }
             if ([menu numberOfItems] > 0 && [bookmarks count] > 0)

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