mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplify window sizing code a little.

This commit is contained in:
Mitchell Livingston 2006-07-22 16:57:41 +00:00
parent 3f160243da
commit d25466eefc
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/Controller.h
View File

@ -179,6 +179,7 @@
- (void) toggleAdvancedBar: (id) sender; - (void) toggleAdvancedBar: (id) sender;
- (void) setWindowSizeToFit; - (void) setWindowSizeToFit;
- (NSRect) windowFrameFor: (int) count;
- (void) showMainWindow: (id) sender; - (void) showMainWindow: (id) sender;
- (void) linkHomepage: (id) sender; - (void) linkHomepage: (id) sender;

22
macosx/Controller.m
View File

@ -2124,18 +2124,7 @@ static void sleepCallBack(void * controller, io_service_t y,
if ([fDefaults boolForKey: @"AutoSize"]) if ([fDefaults boolForKey: @"AutoSize"])
return [fWindow frame]; return [fWindow frame];
NSRect windowRect = [fWindow frame]; return [self windowFrameFor: [fFilteredTorrents count]];
float newHeight = windowRect.size.height - [fScrollView frame].size.height
+ [fFilteredTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
float minHeight = [fWindow minSize].height;
if (newHeight < minHeight)
newHeight = minHeight;
windowRect.origin.y -= (newHeight - windowRect.size.height);
windowRect.size.height = newHeight;
return windowRect;
} }
- (void) setWindowSizeToFit - (void) setWindowSizeToFit
@ -2143,9 +2132,14 @@ static void sleepCallBack(void * controller, io_service_t y,
if (![fDefaults boolForKey: @"AutoSize"]) if (![fDefaults boolForKey: @"AutoSize"])
return; return;
[fWindow setFrame: [self windowFrameFor: [fTorrents count]] display: YES animate: YES];
}
- (NSRect) windowFrameFor: (int) count
{
NSRect frame = [fWindow frame]; NSRect frame = [fWindow frame];
float newHeight = frame.size.height - [fScrollView frame].size.height float newHeight = frame.size.height - [fScrollView frame].size.height
+ [fTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height); + count * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
float minHeight = [fWindow minSize].height; float minHeight = [fWindow minSize].height;
if (newHeight < minHeight) if (newHeight < minHeight)
@ -2154,7 +2148,7 @@ static void sleepCallBack(void * controller, io_service_t y,
frame.origin.y -= (newHeight - frame.size.height); frame.origin.y -= (newHeight - frame.size.height);
frame.size.height = newHeight; frame.size.height = newHeight;
[fWindow setFrame: frame display: YES animate: YES]; return frame;
} }
- (void) showMainWindow: (id) sender - (void) showMainWindow: (id) sender