Changeset 10371

Timestamp:

Mar 14, 2010, 2:53:22 AM (12 years ago)

Author:

livings124

Message:

move the code for remembering resize information for the info views into the individual views

Location:

trunk/macosx

Files:

• InfoFileViewController.h (modified) (1 diff)
• InfoFileViewController.m (modified) (2 diffs)
• InfoPeersViewController.h (modified) (1 diff)
• InfoPeersViewController.m (modified) (2 diffs)
• InfoTrackersViewController.h (modified) (1 diff)
• InfoTrackersViewController.m (modified) (3 diffs)
• InfoViewController.h (modified) (1 diff)
• InfoWindowController.m (modified) (8 diffs)

trunk/macosx/InfoFileViewController.h

@@ -42 +42 @@
 - (void) updateInfo;
 
+- (void) saveViewSize;
+
 - (void) setFileFilterText: (id) sender;
 

trunk/macosx/InfoFileViewController.m

@@ -47 +47 @@
 - (void) awakeFromNib
 {
+    const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightFiles"];
+    if (height != 0.0)
+    {
+        NSRect viewRect = [[self view] frame];
+        viewRect.size.height = height;
+        [[self view] setFrame: viewRect];
+    }
+    
     [[fFileFilterField cell] setPlaceholderString: NSLocalizedString(@"Filter", "inspector -> file filter")];
 }
@@ -75 +83 @@
     if ([fTorrents count] == 1)
         [fFileController reloadData];
+}
+
+- (void) saveViewSize
+{
+    [[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightFiles"];
 }
 

trunk/macosx/InfoPeersViewController.h

@@ -45 +45 @@
 - (void) updateInfo;
 
+- (void) saveViewSize;
 - (void) clearView;
 - (void) stopWebSeedAnimation;

trunk/macosx/InfoPeersViewController.m

@@ -48 +48 @@
 - (void) awakeFromNib
 {
+    const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightPeers"];
+    if (height != 0.0)
+    {
+        NSRect viewRect = [[self view] frame];
+        viewRect.size.height = height;
+        [[self view] setFrame: viewRect];
+    }
+    
     //set table header text
     [[[fPeerTable tableColumnWithIdentifier: @"IP"] headerCell] setStringValue: NSLocalizedString(@"IP Address",
@@ -222 +230 @@
 }
 
+- (void) saveViewSize
+{
+    [[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightPeers"];
+}
+
 - (void) clearView
 {

trunk/macosx/InfoTrackersViewController.h

@@ -47 +47 @@
 - (void) updateInfo;
 
+
+- (void) saveViewSize;
 - (void) clearView;
 

trunk/macosx/InfoTrackersViewController.m

@@ -35 +35 @@
 #define TRACKER_REMOVE_TAG 1
 
+
 @interface InfoTrackersViewController (Private)
 
@@ -54 +55 @@
     
     return self;
+}
+
+- (void) awakeFromNib
+{
+    const CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorContentHeightTracker"];
+    if (height != 0.0)
+    {
+        NSRect viewRect = [[self view] frame];
+        viewRect.size.height = height;
+        [[self view] setFrame: viewRect];
+    }
 }
 
@@ -121 +133 @@
         }
     }
+}
+
+- (void) saveViewSize
+{
+    [[NSUserDefaults standardUserDefaults] setFloat: NSHeight([[self view] frame]) forKey: @"InspectorContentHeightTracker"];
 }
 

trunk/macosx/InfoViewController.h

@@ -33 +33 @@
 @optional
 - (void) clearView;
+- (void) saveViewSize;
 
 @end

trunk/macosx/InfoWindowController.m

@@ -142 +142 @@
 - (void) dealloc
 {
-    //save resizeable view height
-    NSString * resizeSaveKey = nil;
-    switch (fCurrentTabTag)
-    {
-        case TAB_TRACKERS_TAG:
-            resizeSaveKey = @"InspectorContentHeightTracker";
-            break;
-        case TAB_PEERS_TAG:
-            resizeSaveKey = @"InspectorContentHeightPeers";
-            break;
-        case TAB_FILE_TAG:
-            resizeSaveKey = @"InspectorContentHeightFiles";
-            break;
-    }
-    if (resizeSaveKey)
-        [[NSUserDefaults standardUserDefaults] setFloat: [[fViewController view] frame].size.height forKey: resizeSaveKey];
-    
     [[NSNotificationCenter defaultCenter] removeObserver: self];
+    
+    if ([fViewController respondsToSelector: @selector(saveViewSize)])
+        [fViewController saveViewSize];
     
     [fGeneralViewController dealloc];
@@ -215 +201 @@
     //take care of old view
     CGFloat oldHeight = 0;
-    NSString * oldResizeSaveKey = nil;
     if (oldTabTag != INVALID)
     {
@@ -221 +206 @@
         [(InfoTabButtonCell *)[fTabMatrix cellWithTag: oldTabTag] setSelectedTab: NO];
         
+        if ([fViewController respondsToSelector: @selector(saveViewSize)])
+            [fViewController saveViewSize];
+        
         if ([fViewController respondsToSelector: @selector(clearView)])
             [fViewController clearView];
         
-        switch (oldTabTag)
-        {
-            case TAB_TRACKERS_TAG:
-                oldResizeSaveKey = @"InspectorContentHeightTracker";
-                break;
-            case TAB_PEERS_TAG:
-                oldResizeSaveKey = @"InspectorContentHeightPeers";
-                break;
-            case TAB_FILE_TAG:
-                oldResizeSaveKey = @"InspectorContentHeightFiles";
-                break;
-        }
-        
         NSView * oldView = [fViewController view];
         oldHeight = NSHeight([oldView frame]);
-        if (oldResizeSaveKey)
-            [[NSUserDefaults standardUserDefaults] setFloat: oldHeight forKey: oldResizeSaveKey];
         
         //remove old view
@@ -249 +222 @@
     //set new tab item
     #warning get titles from view controller?
-    NSString * resizeSaveKey = nil;
     NSString * identifier, * title;
     switch (fCurrentTabTag)
@@ -285 +257 @@
             identifier = TAB_TRACKER_IDENT;
             title = NSLocalizedString(@"Trackers", "Inspector -> title");
-            resizeSaveKey = @"InspectorContentHeightTracker";
             break;
         case TAB_PEERS_TAG:
@@ -297 +268 @@
             identifier = TAB_PEERS_IDENT;
             title = NSLocalizedString(@"Peers", "Inspector -> title");
-            resizeSaveKey = @"InspectorContentHeightPeers";
             break;
         case TAB_FILE_TAG:
@@ -309 +279 @@
             identifier = TAB_FILES_IDENT;
             title = NSLocalizedString(@"Files", "Inspector -> title");
-            resizeSaveKey = @"InspectorContentHeightFiles";
             break;
         case TAB_OPTIONS_TAG:
@@ -342 +311 @@
     NSRect windowRect = [window frame], viewRect = [view frame];
     
-    if (resizeSaveKey)
-    {
-        CGFloat height = [[NSUserDefaults standardUserDefaults] floatForKey: resizeSaveKey];
-        if (height != 0.0)
-            viewRect.size.height = MAX(height, TAB_MIN_HEIGHT);
-    }
-    
-    CGFloat difference = (viewRect.size.height - oldHeight) * [window userSpaceScaleFactor];
+    CGFloat difference = (NSHeight(viewRect) - oldHeight) * [window userSpaceScaleFactor];
     windowRect.origin.y -= difference;
     windowRect.size.height += difference;
     
-    if (resizeSaveKey)
-    {
-        if (!oldResizeSaveKey)
-        {
-            [window setMinSize: NSMakeSize([window minSize].width, windowRect.size.height - viewRect.size.height + TAB_MIN_HEIGHT)];
-            [window setMaxSize: NSMakeSize(FLT_MAX, FLT_MAX)];
-        }
+    if ([fViewController respondsToSelector: @selector(saveViewSize)]) //a little bit hacky, but avoids an extra required method
+    {
+        [window setMinSize: NSMakeSize([window minSize].width, NSHeight(windowRect) - NSHeight(viewRect) + TAB_MIN_HEIGHT)];
+        [window setMaxSize: NSMakeSize(FLT_MAX, FLT_MAX)];
     }
     else
     {
-        [window setMinSize: NSMakeSize([window minSize].width, windowRect.size.height)];
-        [window setMaxSize: NSMakeSize(FLT_MAX, windowRect.size.height)];
+        [window setMinSize: NSMakeSize([window minSize].width, NSHeight(windowRect))];
+        [window setMaxSize: NSMakeSize(FLT_MAX, NSHeight(windowRect))];
     }