[Skim-app-commit] SF.net SVN: skim-app:[13919] trunk/SKThumbnailView.m

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

Revision: 13919
          http://sourceforge.net/p/skim-app/code/13919
Author:   hofman
Date:     2023-12-18 18:32:43 +0000 (Mon, 18 Dec 2023)
Log Message:
-----------
convenience accessor to get the collection view

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

Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m     2023-12-18 18:09:52 UTC (rev 13918)
+++ trunk/SKThumbnailView.m     2023-12-18 18:32:43 UTC (rev 13919)
@@ -137,7 +137,7 @@
 }
 
 - (NSVisualEffectView *)newHighlightView {
-    SKOverviewView *overviewView = (SKOverviewView *)[[self controller] 
collectionView];
+    SKOverviewView *overviewView = [self collectionView];
     NSVisualEffectView *highlightView = [overviewView 
newViewWithIdentifier:HIGHLIGHT_ID];
     if (highlightView == nil) {
         highlightView = [[NSVisualEffectView alloc] init];
@@ -148,7 +148,7 @@
 }
 
 - (NSImageView *)newMarkView {
-    NSImageView *view = [(SKOverviewView *)[[self controller] collectionView] 
newViewWithIdentifier:MARK_ID];
+    NSImageView *view = [[self collectionView] newViewWithIdentifier:MARK_ID];
     if (view == nil) {
         NSImage *markImage = [NSImage markImage];
         NSRect rect = NSZeroRect;
@@ -163,7 +163,7 @@
 
 - (void)removeView:(id)view {
     [view removeFromSuperview];
-    [(SKOverviewView *)[[self controller] collectionView] cacheView:view];
+    [[self collectionView] cacheView:view];
 }
 
 - (void)updateImageHighlightMask:(NSNotification *)note {
@@ -303,6 +303,10 @@
     }
 }
 
+- (SKOverviewView *)collectionView {
+    return (SKOverviewView *)[[self controller] collectionView];
+}
+
 #pragma mark Drawing
 
 - (void)drawRect:(NSRect)dirtyRect {
@@ -433,7 +437,7 @@
     if ([NSApp willDragMouse]) {
         
         NSUInteger pageIndex = [[self thumbnail] pageIndex];
-        NSIndexSet *selectionIndexes = [[[self controller] collectionView] 
selectionIndexes];
+        NSIndexSet *selectionIndexes = [[self collectionView] 
selectionIndexes];
         if ([selectionIndexes count] < 2 || [selectionIndexes 
containsIndex:pageIndex] == NO)
             selectionIndexes = nil;
         
@@ -449,7 +453,7 @@
                     return @[[self draggingImageComponent]];
                 }];
             } else {
-                NSCollectionView *collectionView = [[self controller] 
collectionView];
+                NSCollectionView *collectionView = [self collectionView];
                 [dragItem setImageComponentsProvider:^{
                     NSMutableArray *components = [NSMutableArray array];
                     __block NSInteger offset = -(NSInteger)[selectionIndexes 
countOfIndexesInRange:NSMakeRange(0, pageIndex)];
@@ -480,7 +484,7 @@
 
 - (void)copy:(id)sender {
     PDFPage *page = [[self thumbnail] page];
-    NSIndexSet *selectionIndexes = [[[self controller] collectionView] 
selectionIndexes];
+    NSIndexSet *selectionIndexes = [[self collectionView] selectionIndexes];
     if ([selectionIndexes count] < 2 || [selectionIndexes containsIndex:[page 
pageIndex]] == NO)
         selectionIndexes = nil;
     [[[self thumbnail] page] writeToClipboardForPageIndexes:selectionIndexes];
@@ -488,7 +492,7 @@
 
 - (void)copyURL:(id)sender {
     PDFPage *page = [[self thumbnail] page];
-    NSIndexSet *selectionIndexes = [[[self controller] collectionView] 
selectionIndexes];
+    NSIndexSet *selectionIndexes = [[self collectionView] selectionIndexes];
     if ([selectionIndexes count] < 2 || [selectionIndexes containsIndex:[page 
pageIndex]] == NO)
         selectionIndexes = nil;
     NSMutableArray *urls = [NSMutableArray array];
@@ -518,7 +522,7 @@
 }
 
 - (void)applyMenuHighlighted:(BOOL)flag {
-    NSCollectionView *collectionView = [[self controller] collectionView];
+    NSCollectionView *collectionView = [self collectionView];
     NSIndexSet *selectionIndexes = [collectionView selectionIndexes];
     if ([selectionIndexes count] > 1 && [selectionIndexes 
containsIndex:[[[self thumbnail] page] pageIndex]]) {
         [selectionIndexes enumerateIndexesUsingBlock:^(NSUInteger i, BOOL 
*stop){
@@ -579,7 +583,7 @@
 }
 
 - (BOOL)accessibilityPerformPress {
-    [[controller collectionView] setSelectionIndexes:[NSIndexSet 
indexSetWithIndex:[thumbnail pageIndex]]];
+    [[self collectionView] setSelectionIndexes:[NSIndexSet 
indexSetWithIndex:[thumbnail pageIndex]]];
     return YES;
 }
 

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