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

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

Revision: 13471
          http://sourceforge.net/p/skim-app/code/13471
Author:   hofman
Date:     2023-06-13 19:09:43 +0000 (Tue, 13 Jun 2023)
Log Message:
-----------
observe label changes for thumbnail view, when changing sequential page 
numbering

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

Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m     2023-06-13 18:54:33 UTC (rev 13470)
+++ trunk/SKThumbnailView.m     2023-06-13 19:09:43 UTC (rev 13471)
@@ -59,6 +59,7 @@
 #define MARK_OFFSET 16.0
 
 #define IMAGE_KEY @"image"
+#define LABEL_KEY @"label"
 
 #define HIGHLIGHT_ID @"highlight"
 #define MARK_ID @"mark"
@@ -112,7 +113,10 @@
 
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
-    @try { [thumbnail removeObserver:self forKeyPath:IMAGE_KEY 
context:&SKThumbnailViewThumbnailObservationContext]; }
+    @try {
+        [thumbnail removeObserver:self forKeyPath:IMAGE_KEY 
context:&SKThumbnailViewThumbnailObservationContext];
+        [thumbnail removeObserver:self forKeyPath:LABEL_KEY 
context:&SKThumbnailViewThumbnailObservationContext];
+    }
     @catch (id e) {}
     controller = nil;
     SKDESTROY(imageView);
@@ -249,10 +253,12 @@
 - (void)setThumbnail:(SKThumbnail *)newThumbnail {
     if (thumbnail != newThumbnail) {
         [thumbnail removeObserver:self forKeyPath:IMAGE_KEY 
context:&SKThumbnailViewThumbnailObservationContext];
+        [thumbnail removeObserver:self forKeyPath:LABEL_KEY 
context:&SKThumbnailViewThumbnailObservationContext];
         [thumbnail release];
         thumbnail = [newThumbnail retain];
         [labelView setObjectValue:[thumbnail label]];
         [thumbnail addObserver:self forKeyPath:IMAGE_KEY 
options:NSKeyValueObservingOptionInitial 
context:&SKThumbnailViewThumbnailObservationContext];
+        [thumbnail addObserver:self forKeyPath:LABEL_KEY 
options:NSKeyValueObservingOptionInitial 
context:&SKThumbnailViewThumbnailObservationContext];
         if ([self isSelected] || [self highlightLevel] > 0)
             [self updateLabelHighlight];
     }
@@ -348,10 +354,16 @@
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object 
change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
     if (context == &SKThumbnailViewThumbnailObservationContext) {
-        if ([self window] && NSIsEmptyRect([imageView visibleRect]) == NO)
-            [imageView setImage:[thumbnail image]];
-        else
-            [imageView setImage:nil];
+        if ([keyPath isEqualToString:IMAGE_KEY]) {
+            if ([self window] && NSIsEmptyRect([imageView visibleRect]) == NO)
+                [imageView setImage:[thumbnail image]];
+            else
+                [imageView setImage:nil];
+        } else if ([keyPath isEqualToString:LABEL_KEY]) {
+            [labelView setObjectValue:[thumbnail label]];
+            if (RUNNING_AFTER(10_15) && ([self isSelected] || [self 
highlightLevel] > 0))
+                [self updateLabelHighlightMask:nil];
+        }
     } else {
         [super observeValueForKeyPath:keyPath ofObject:object change:change 
context:context];
     }

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