[zephyrchat-cvs] zchat/zChat ZChatFriendsController.h,1.13,1.14 ZChatFriendsController.mm,1.17,1.18

[<ak...@us...>]

Update of /cvsroot/zephyrchat/zchat/zChat
In directory sc8-pr-cvs1:/tmp/cvs-serv30657

Modified Files:
	ZChatFriendsController.h ZChatFriendsController.mm 
Log Message:
"Intelligent" zoom of friends window.


Index: ZChatFriendsController.h
===================================================================
RCS file: /cvsroot/zephyrchat/zchat/zChat/ZChatFriendsController.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ZChatFriendsController.h	31 Mar 2003 15:07:46 -0000	1.13
+++ ZChatFriendsController.h	31 Mar 2003 17:07:21 -0000	1.14
@@ -14,6 +14,7 @@
 extern NSString * const ZChatFriendStatusNotification;
 
 @interface ZChatFriendsController : NSWindowController <AKActionScrollViewDelegate> {
+    IBOutlet NSScrollView *_friendScroller;
     IBOutlet NSView *_friendView;
     IBOutlet NSPopUpButton *_statusMenu;
     IBOutlet NSTextField *_name;

Index: ZChatFriendsController.mm
===================================================================
RCS file: /cvsroot/zephyrchat/zchat/zChat/ZChatFriendsController.mm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ZChatFriendsController.mm	31 Mar 2003 16:33:09 -0000	1.17
+++ ZChatFriendsController.mm	31 Mar 2003 17:07:22 -0000	1.18
@@ -157,6 +157,22 @@
     [_friendView setNeedsDisplay:YES];
 }
 
+- (NSRect)windowWillUseStandardFrame:(NSWindow *)window defaultFrame:(NSRect)newFrame {
+    NSSize scrollerSize = [NSScrollView frameSizeForContentSize:[_friendView frame].size
+                                          hasHorizontalScroller:[_friendScroller hasHorizontalScroller]
+                                            hasVerticalScroller:[_friendScroller hasVerticalScroller]
+                                                     borderType:[_friendScroller borderType]];
+    NSRect standardFrame = [window frame];
+    standardFrame.size.height += scrollerSize.height - NSHeight([_friendScroller frame]);
+    standardFrame.origin.y -= scrollerSize.height - NSHeight([_friendScroller frame]);
+    if (NSHeight(standardFrame) < [window minSize].height) {
+        standardFrame.origin.y += [window minSize].height - NSHeight(standardFrame);
+        standardFrame.size.height = [window minSize].height;
+    }
+    
+    return standardFrame;
+}
+
 - (void)selectAll:(id)sender {
     [_data makeObjectsPerformSelector:@selector(select)];
 }