cocoaui: fix became/resigned key handler in DdbSeekBar, PlaylistHeade…

…rView and DdbTabStrip
DeaDBeeF-Player · Nov 29, 2024 · 52935d9 · 52935d9
1 parent 8bb8403
commit 52935d9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/plugins/cocoaui/DdbTabStrip/DdbTabStrip.m b/plugins/cocoaui/DdbTabStrip/DdbTabStrip.m
@@ -208,15 +208,17 @@ - (void)setup {
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(windowDidBecomeKey:)
                                                name:NSWindowDidBecomeKeyNotification
-                                             object:self.window];
+                                             object:nil];
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(windowDidBecomeKey:)
                                                name:NSWindowDidResignKeyNotification
-                                             object:self.window];
+                                             object:nil];
 }
 
-- (void)windowDidBecomeKey:(id)sender {
-    self.needsDisplay = YES;
+- (void)windowDidBecomeKey:(NSNotification *)notification {
+    if (notification.object == self.window) {
+        self.needsDisplay = YES;
+    }
 }
 
 - (int)tabWidthForIndex:(int)tab {

diff --git a/plugins/cocoaui/Playlist/PlaylistHeaderView.m b/plugins/cocoaui/Playlist/PlaylistHeaderView.m
@@ -93,17 +93,19 @@ - (PlaylistHeaderView *)initWithFrame:(NSRect)rect {
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(windowDidBecomeOrResignKey:)
                                                name:NSWindowDidBecomeKeyNotification
-                                             object:self.window];
+                                             object:nil];
     [NSNotificationCenter.defaultCenter addObserver:self
                                            selector:@selector(windowDidBecomeOrResignKey:)
                                                name:NSWindowDidResignKeyNotification
-                                             object:self.window];
+                                             object:nil];
 
     return self;
 }
 
 - (void)windowDidBecomeOrResignKey:(NSNotification *)notification {
-    self.needsDisplay = YES;
+    if (notification.object == self.window) {
+        self.needsDisplay = YES;
+    }
 }
 
 - (void)drawColumnHeader:(DdbListviewCol_t)col inRect:(NSRect)rect {

diff --git a/plugins/cocoaui/widgets/DdbSeekBar.m b/plugins/cocoaui/widgets/DdbSeekBar.m
@@ -232,6 +232,9 @@ - (void)updateThumbColors {
 }
 
 - (void)becameKey:(NSNotification *)notification {
+    if (notification.object != self.window) {
+        return;
+    }
     [CATransaction begin];
     [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
     self.isKey = YES;
@@ -242,6 +245,9 @@ - (void)becameKey:(NSNotification *)notification {
 }
 
 - (void)resignedKey:(NSNotification *)notification {
+    if (notification.object != self.window) {
+        return;
+    }
     [CATransaction begin];
     [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
     self.isKey = NO;