Changeset 660

Timestamp:

Jul 22, 2006, 6:25:11 PM (16 years ago)

Author:

livings124

Message:

Remove and resize after sheet disappears.

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (3 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)

trunk/macosx/Controller.h

@@ -181 +181 @@
 - (void) setAutoSize: (NSNotification *) notification;
 - (void) setWindowSizeToFit;
-- (NSRect) windowFrameFor: (int) count;
+- (NSRect) windowFrameForAmount: (int) amount;
 
 - (void) showMainWindow:    (id) sender;

trunk/macosx/Controller.m

@@ -666 +666 @@
 
             NSBeginAlertSheet(title, @"Remove", @"Cancel", nil, fWindow, self,
-                @selector(removeSheetDidEnd:returnCode:contextInfo:), nil, dict, message);
+                nil, @selector(removeSheetDidEnd:returnCode:contextInfo:), dict, message);
             return;
         }
@@ -2121 +2121 @@
 - (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
 {
-    return [self windowFrameFor: [fFilteredTorrents count]];
+    return [self windowFrameForAmount: [fFilteredTorrents count]];
 }
 
@@ -2133 +2133 @@
 {
     if ([fDefaults boolForKey: @"AutoSize"])
-        [fWindow setFrame: [self windowFrameFor: [fTorrents count]] display: YES animate: YES];
-}
-
-- (NSRect) windowFrameFor: (int) count
+        [fWindow setFrame: [self windowFrameForAmount: [fTorrents count]] display: YES animate: YES];
+}
+
+- (NSRect) windowFrameForAmount: (int) amount
 {
     NSRect frame = [fWindow frame];
     float newHeight = frame.size.height - [fScrollView frame].size.height
-        + count * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
+        + amount * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
 
     float minHeight = [fWindow minSize].height;

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -12 +12 @@
                 <string>366 546 420 63 0 0 1152 842 </string>
                 <key>1603</key>
-                <string>337 544 477 67 0 0 1152 842 </string>
+                <string>360 371 477 67 0 0 1152 842 </string>
                 <key>29</key>
                 <string>9 780 451 44 0 0 1152 842 </string>
@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>1041</integer>
+                <integer>21</integer>
                 <integer>29</integer>
-                <integer>1041</integer>
-                <integer>1603</integer>
         </array>
         <key>IBSystem Version</key>