From 41e4c33e2b44033059eb63747e15a11da9dc2b5e Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 16 Jul 2006 04:50:32 +0000 Subject: [PATCH] Highlighting of filter buttons should hopefully be even more "less buggy." --- macosx/BarButton.m | 9 +++------ macosx/Controller.m | 6 ++++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/macosx/BarButton.m b/macosx/BarButton.m index b11330e84..e68e00cc9 100644 --- a/macosx/BarButton.m +++ b/macosx/BarButton.m @@ -32,6 +32,7 @@ if ((self = [super initWithCoder: coder])) { fEnabled = NO; + fTrackingTag = 0; NSSize buttonSize = [self frame].size; fButtonNormal = [[NSImage alloc] initWithSize: buttonSize]; @@ -104,11 +105,6 @@ return self; } -- (void) awakeFromNib -{ - fTrackingTag = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO]; -} - - (void) dealloc { [fButtonNormal release]; @@ -206,7 +202,8 @@ - (void) resetBounds: (NSNotification *) notification { - [self removeTrackingRect: fTrackingTag]; + if (fTrackingTag) + [self removeTrackingRect: fTrackingTag]; fTrackingTag = [self addTrackingRect: [self bounds] owner: self userData: nil assumeInside: NO]; } diff --git a/macosx/Controller.m b/macosx/Controller.m index 625aaf904..6f1fbc290 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1571,6 +1571,12 @@ static void sleepCallBack(void * controller, io_service_t y, NSSize minSize = [fWindow contentMinSize]; minSize.height += heightChange; [fWindow setContentMinSize: minSize]; + + //reset tracking rects for filter buttons + [fNoFilterButton resetBounds: nil]; + [fSeedFilterButton resetBounds: nil]; + [fDownloadFilterButton resetBounds: nil]; + [fPauseFilterButton resetBounds: nil]; } - (void) toggleAdvancedBar: (id) sender