From 58950c148e94c66ead77cabf23be2cbb9b967de8 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 21 Aug 2007 05:03:53 +0000 Subject: [PATCH] refine inspector resize code a bit more --- macosx/InfoWindowController.m | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 9164e64cb..631959714 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -710,23 +710,20 @@ BOOL canResizeVertical = NO; float height; - if ([identifier isEqualToString: TAB_ACTIVITY_IDENT]) + if ([identifier isEqualToString: TAB_INFO_IDENT]) + height = TAB_INFO_HEIGHT; + else if ([identifier isEqualToString: TAB_ACTIVITY_IDENT]) { height = TAB_ACTIVITY_HEIGHT; [fPiecesView updateView: YES]; } - else if ([identifier isEqualToString: TAB_PEERS_IDENT] || [identifier isEqualToString: TAB_FILES_IDENT]) - { - canResizeVertical = YES; - - //height only needed if resize will take place - if (!fCanResizeVertical) - height = MAX(TAB_RESIZABLE_MIN_HEIGHT, [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorHeight"]); - } else if ([identifier isEqualToString: TAB_OPTIONS_IDENT]) height = TAB_OPTIONS_HEIGHT; else - height = TAB_INFO_HEIGHT; + { + canResizeVertical = YES; + height = MAX(TAB_RESIZABLE_MIN_HEIGHT, [[NSUserDefaults standardUserDefaults] floatForKey: @"InspectorHeight"]); + } NSWindow * window = [self window]; NSView * view = [[fTabView selectedTabViewItem] view]; @@ -754,8 +751,8 @@ } [window setMinSize: NSMakeSize([window minSize].width, !canResizeVertical ? windowFrame.size.height - : (windowFrame.size.height - [[[fTabView selectedTabViewItem] view] frame].size.height) + TAB_RESIZABLE_MIN_HEIGHT)]; - [window setMaxSize: NSMakeSize([window maxSize].width, !canResizeVertical ? windowFrame.size.height : FLT_MAX)]; + : (windowFrame.size.height - (viewFrame.size.height + difference)) + TAB_RESIZABLE_MIN_HEIGHT)]; + [window setMaxSize: NSMakeSize(FLT_MAX, !canResizeVertical ? windowFrame.size.height : FLT_MAX)]; fCanResizeVertical = canResizeVertical; }