diff --git a/macosx/InfoActivityViewController.h b/macosx/InfoActivityViewController.h index 1a060450d..427288fe1 100644 --- a/macosx/InfoActivityViewController.h +++ b/macosx/InfoActivityViewController.h @@ -50,6 +50,6 @@ - (void) setPiecesView: (id) sender; - (void) setPiecesViewForAvailable: (BOOL) available; -- (void) clearPiecesView; +- (void) clearView; @end diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m index 05bb5128b..cd2de04ec 100644 --- a/macosx/InfoActivityViewController.m +++ b/macosx/InfoActivityViewController.m @@ -148,7 +148,7 @@ [fPiecesView updateView]; } -- (void) clearPiecesView +- (void) clearView { [fPiecesView clearView]; } diff --git a/macosx/InfoPeersViewController.h b/macosx/InfoPeersViewController.h index ceb241491..ac92baa0c 100644 --- a/macosx/InfoPeersViewController.h +++ b/macosx/InfoPeersViewController.h @@ -44,7 +44,7 @@ - (void) setInfoForTorrents: (NSArray *) torrents; - (void) updateInfo; -- (void) clearPeers; +- (void) clearView; - (void) stopWebSeedAnimation; @end diff --git a/macosx/InfoPeersViewController.m b/macosx/InfoPeersViewController.m index 7087cc12c..108627c80 100644 --- a/macosx/InfoPeersViewController.m +++ b/macosx/InfoPeersViewController.m @@ -221,7 +221,7 @@ } } -- (void) clearPeers +- (void) clearView { //if in the middle of animating, just stop and resize immediately if (fWebSeedTableAnimation) diff --git a/macosx/InfoTrackersViewController.h b/macosx/InfoTrackersViewController.h index 88855489a..4d6f1287d 100644 --- a/macosx/InfoTrackersViewController.h +++ b/macosx/InfoTrackersViewController.h @@ -46,7 +46,7 @@ - (void) setInfoForTorrents: (NSArray *) torrents; - (void) updateInfo; -- (void) clearTrackers; +- (void) clearView; - (void) addRemoveTracker: (id) sender; diff --git a/macosx/InfoTrackersViewController.m b/macosx/InfoTrackersViewController.m index 5c5a78750..a4630fdf1 100644 --- a/macosx/InfoTrackersViewController.m +++ b/macosx/InfoTrackersViewController.m @@ -122,7 +122,7 @@ } } -- (void) clearTrackers +- (void) clearView { [fTrackers release]; fTrackers = nil; diff --git a/macosx/InfoViewController.h b/macosx/InfoViewController.h index 283926695..9d73dd480 100644 --- a/macosx/InfoViewController.h +++ b/macosx/InfoViewController.h @@ -30,4 +30,7 @@ - (void) setInfoForTorrents: (NSArray *) torrents; - (void) updateInfo; +@optional +- (void) clearView; + @end diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 91e8b763a..cfd723742 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -213,31 +213,24 @@ typedef enum //deselect old tab item [(InfoTabButtonCell *)[fTabMatrix cellWithTag: oldTabTag] setSelectedTab: NO]; + if ([fViewController respondsToSelector: @selector(clearView)]) + [fViewController clearView]; + switch (oldTabTag) { - case TAB_ACTIVITY_TAG: - [fActivityViewController clearPiecesView]; - break; - case TAB_TRACKERS_TAG: - [fTrackersViewController clearTrackers]; - oldResizeSaveKey = @"InspectorContentHeightTracker"; break; - case TAB_PEERS_TAG: - [fPeersViewController clearPeers]; - oldResizeSaveKey = @"InspectorContentHeightPeers"; break; - case TAB_FILE_TAG: oldResizeSaveKey = @"InspectorContentHeightFiles"; break; } NSView * oldView = [fViewController view]; - oldHeight = [oldView frame].size.height; + oldHeight = NSHeight([oldView frame]); if (oldResizeSaveKey) [[NSUserDefaults standardUserDefaults] setFloat: oldHeight forKey: oldResizeSaveKey];