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

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

Revision: 12415
          http://sourceforge.net/p/skim-app/code/12415
Author:   hofman
Date:     2021-09-19 14:45:12 +0000 (Sun, 19 Sep 2021)
Log Message:
-----------
Emphasize thumbnail view label only for key window, as the source list table 
does

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

Modified: trunk/SKThumbnailView.m
===================================================================
--- trunk/SKThumbnailView.m     2021-09-18 18:19:54 UTC (rev 12414)
+++ trunk/SKThumbnailView.m     2021-09-19 14:45:12 UTC (rev 12415)
@@ -128,7 +128,7 @@
 
 - (void)updateBackgroundStyle {
     NSBackgroundStyle style = [self backgroundStyle];
-    if ([self isSelected] && ([[self window] isKeyWindow] || [[self window] 
isMainWindow]))
+    if ([self isSelected] && [[self window] isKeyWindow])
         style = NSBackgroundStyleDark;
     if ([[labelView cell] backgroundStyle] != style) {
         [[labelView cell] setBackgroundStyle:style];
@@ -222,7 +222,7 @@
                 labelHighlightView = [self newHighlightView];
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpartial-availability"
-                [labelHighlightView setEmphasized:[[self window] isKeyWindow] 
|| [[self window] isMainWindow]];
+                [labelHighlightView setEmphasized:[[self window] isKeyWindow]];
 #pragma clang diagnostic pop
                 [labelHighlightView setFrame:[labelView frame]];
                 [labelHighlightView setAutoresizingMask:NSViewWidthSizable | 
NSViewMaxYMargin];
@@ -324,7 +324,7 @@
         rect = NSInsetRect(rect, inset, 0.0);
         if (NSIntersectsRect(dirtyRect, rect)) {
             NSColor *color;
-            if ([[self window] isKeyWindow] || [[self window] isMainWindow])
+            if ([[self window] isKeyWindow])
                 color = [NSColor alternateSelectedControlColor];
             else if ([self backgroundStyle] == NSBackgroundStyleDark)
                 color = [NSColor darkGrayColor];
@@ -353,13 +353,13 @@
     }
 }
 
-- (void)handleKeyOrMainStateChangedNotification:(NSNotification *)note {
+- (void)handleKeyStateChangedNotification:(NSNotification *)note {
     if ([self isSelected] || [self highlightLevel] > 0) {
         [self updateBackgroundStyle];
         if (RUNNING_AFTER(10_15))
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpartial-availability"
-            [labelHighlightView setEmphasized:[[self window] isKeyWindow] || 
[[self window] isMainWindow]];
+            [labelHighlightView setEmphasized:[[self window] isKeyWindow]];
 #pragma clang diagnostic pop
         else
             [self setNeedsDisplayInRect:[labelView frame]];
@@ -375,8 +375,6 @@
     NSWindow *oldWindow = [self window];
     if (oldWindow) {
         NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-        [nc removeObserver:self name:NSWindowDidBecomeMainNotification 
object:oldWindow];
-        [nc removeObserver:self name:NSWindowDidResignMainNotification 
object:oldWindow];
         [nc removeObserver:self name:NSWindowDidBecomeKeyNotification 
object:oldWindow];
         [nc removeObserver:self name:NSWindowDidResignKeyNotification 
object:oldWindow];
         NSView *clipView = [[self enclosingScrollView] contentView];
@@ -385,10 +383,8 @@
     }
     if (newWindow) {
         NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-        [nc addObserver:self 
selector:@selector(handleKeyOrMainStateChangedNotification:) 
name:NSWindowDidBecomeMainNotification object:newWindow];
-        [nc addObserver:self 
selector:@selector(handleKeyOrMainStateChangedNotification:) 
name:NSWindowDidResignMainNotification object:newWindow];
-        [nc addObserver:self 
selector:@selector(handleKeyOrMainStateChangedNotification:) 
name:NSWindowDidBecomeKeyNotification object:newWindow];
-        [nc addObserver:self 
selector:@selector(handleKeyOrMainStateChangedNotification:) 
name:NSWindowDidResignKeyNotification object:newWindow];
+        [nc addObserver:self 
selector:@selector(handleKeyStateChangedNotification:) 
name:NSWindowDidBecomeKeyNotification object:newWindow];
+        [nc addObserver:self 
selector:@selector(handleKeyStateChangedNotification:) 
name:NSWindowDidResignKeyNotification object:newWindow];
     }
     [super viewWillMoveToWindow:newWindow];
 }
@@ -400,7 +396,7 @@
             [[NSNotificationCenter defaultCenter] addObserver:self 
selector:@selector(handleScrollBoundsChangedNotification:) 
name:NSViewBoundsDidChangeNotification object:clipView];
             [self handleScrollBoundsChangedNotification:nil];
         }
-        [self handleKeyOrMainStateChangedNotification:nil];
+        [self handleKeyStateChangedNotification:nil];
     }
     [super viewDidMoveToWindow];
 }

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