Changeset 720 for trunk

Timestamp:

Aug 5, 2006, 1:22:30 PM (16 years ago)

Author:

livings124

Message:

Make the filter buttons themselves control when they are active/inactive.

Location:

trunk/macosx

Files:

• BarButton.h (modified) (1 diff)
• BarButton.m (modified) (3 diffs)
• Controller.m (modified) (1 diff)
• PrefsController.m (modified) (1 diff)

trunk/macosx/BarButton.h

@@ -38 +38 @@
 - (void) resetBounds: (NSNotification *) notification;
 
-- (void) setForActive;
-- (void) setForInactive;
+- (void) setForActive: (NSNotification *) notification;
+- (void) setForInactive: (NSNotification *) notification;
 
 @end

trunk/macosx/BarButton.m

@@ -46 +46 @@
         [self setAlternateImage: fButtonPressed];
         
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(resetBounds:)
+        NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+        
+        [nc addObserver: self selector: @selector(setForActive:)
+                    name: NSWindowDidBecomeKeyNotification object: nil];
+        
+        [nc addObserver: self selector: @selector(setForInactive:)
+                    name: NSWindowDidResignKeyNotification object: nil];
+        
+        [nc addObserver: self selector: @selector(resetBounds:)
                     name: NSViewBoundsDidChangeNotification object: nil];
         }
@@ -243 +251 @@
 }
 
-- (void) setForActive
-{
+- (void) setForActive: (NSNotification *) notification
+{
+    NSWindow * window;
+    if (!(window = [notification object]) || window != [self window])
+        return;
+
     if ([self image] == fButtonSelectedDim)
         [self setImage: fButtonSelected];
@@ -254 +266 @@
 }
 
-- (void) setForInactive
-{
+- (void) setForInactive: (NSNotification *) notification
+{
+    NSWindow * window;
+    if (!(window = [notification object]) || window != [self window])
+        return;
+
     [self setImage: [self image] == fButtonSelected ? fButtonSelectedDim : fButtonNormalDim];
     

trunk/macosx/Controller.m

@@ -2208 +2208 @@
         [self resetDockBadge: nil];
     }
-    
-    //set filter images as active
-    [fNoFilterButton setForActive];
-    [fSeedFilterButton setForActive];
-    [fDownloadFilterButton setForActive];
-    [fPauseFilterButton setForActive];
-}
-
-- (void) windowDidResignKey: (NSNotification *) notification
-{
-    //set filter images as inactive
-    [fNoFilterButton setForInactive];
-    [fSeedFilterButton setForInactive];
-    [fDownloadFilterButton setForInactive];
-    [fPauseFilterButton setForInactive];
 }
 

trunk/macosx/PrefsController.m

@@ -78 +78 @@
         fHandle = handle;
         
-        [[self window] update]; //makesure nib is loaded right away
+        [[self window] update]; //make sure nib is loaded right away
     }
     return self;