Changeset 660


Ignore:
Timestamp:
Jul 22, 2006, 6:25:11 PM (16 years ago)
Author:
livings124
Message:

Remove and resize after sheet disappears.

Location:
trunk/macosx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/Controller.h

    r659 r660  
    181181- (void) setAutoSize: (NSNotification *) notification;
    182182- (void) setWindowSizeToFit;
    183 - (NSRect) windowFrameFor: (int) count;
     183- (NSRect) windowFrameForAmount: (int) amount;
    184184
    185185- (void) showMainWindow:    (id) sender;
  • trunk/macosx/Controller.m

    r659 r660  
    666666
    667667            NSBeginAlertSheet(title, @"Remove", @"Cancel", nil, fWindow, self,
    668                 @selector(removeSheetDidEnd:returnCode:contextInfo:), nil, dict, message);
     668                nil, @selector(removeSheetDidEnd:returnCode:contextInfo:), dict, message);
    669669            return;
    670670        }
     
    21212121- (NSRect) windowWillUseStandardFrame: (NSWindow *) window defaultFrame: (NSRect) defaultFrame
    21222122{
    2123     return [self windowFrameFor: [fFilteredTorrents count]];
     2123    return [self windowFrameForAmount: [fFilteredTorrents count]];
    21242124}
    21252125
     
    21332133{
    21342134    if ([fDefaults boolForKey: @"AutoSize"])
    2135         [fWindow setFrame: [self windowFrameFor: [fTorrents count]] display: YES animate: YES];
    2136 }
    2137 
    2138 - (NSRect) windowFrameFor: (int) count
     2135        [fWindow setFrame: [self windowFrameForAmount: [fTorrents count]] display: YES animate: YES];
     2136}
     2137
     2138- (NSRect) windowFrameForAmount: (int) amount
    21392139{
    21402140    NSRect frame = [fWindow frame];
    21412141    float newHeight = frame.size.height - [fScrollView frame].size.height
    2142         + count * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
     2142        + amount * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
    21432143
    21442144    float minHeight = [fWindow minSize].height;
  • trunk/macosx/English.lproj/MainMenu.nib/info.nib

    r652 r660  
    1212                <string>366 546 420 63 0 0 1152 842 </string>
    1313                <key>1603</key>
    14                 <string>337 544 477 67 0 0 1152 842 </string>
     14                <string>360 371 477 67 0 0 1152 842 </string>
    1515                <key>29</key>
    1616                <string>9 780 451 44 0 0 1152 842 </string>
     
    3232        <key>IBOpenObjects</key>
    3333        <array>
     34                <integer>1041</integer>
     35                <integer>21</integer>
    3436                <integer>29</integer>
    35                 <integer>1041</integer>
    36                 <integer>1603</integer>
    3737        </array>
    3838        <key>IBSystem Version</key>
Note: See TracChangeset for help on using the changeset viewer.