Changeset 3248

Timestamp:

06/04/06 17:36:57 (2 years ago)

Author:

timothy

Message:

Sidebar mode is now working! Freaking finally! It was a lame bug... Anyway, it is now the default look.

Files:

• trunk/Controllers/JVSidebarChatWindowController.m (modified) (2 diffs)
• trunk/Resources/JVSidebarChatWindow.nib/info.nib (modified) (1 diff)
• trunk/Resources/JVSidebarChatWindow.nib/keyedobjects.nib (modified) (previous)
• trunk/Resources/info.colloquy.plist (modified) (1 diff)
• trunk/Views/JVSideSplitView.m (modified) (2 diffs)
• trunk/Views/JVSplitView.m (modified) (1 diff)

trunk/Controllers/JVSidebarChatWindowController.m

@@ -32 +32 @@
-}
-
+- (float) splitView:(NSSplitView *) splitView constrainSplitPosition:(float) proposedPosition ofSubviewAt:(int) index {
+        // don't do anything here
+        return proposedPosition;
+}
+
+- (void) splitViewWillResizeSubviews:(NSNotification *) notification {
+        // don't do anything here
+}
+
-- (void) splitViewDidResizeSubviews:(NSNotification *) notification {
-        if( ! _forceSplitViewPosition )
@@ -38 +47 @@
-}
-
-ender
-
-
-55
+plitView
+//
+//
+100
-}
-
-ender
+plitView
-        return 300.;
+}
+
+- (BOOL) splitView:(NSSplitView *) splitView canCollapseSubview:(NSView *) subview {
+        return NO;
-}
-

trunk/Resources/JVSidebarChatWindow.nib/info.nib

@@ -6 +6 @@
-        <string>576 58 365 309 0 0 1440 878 </string>
-        <key>IBFramework Version</key>
-3.0
+6.1
-        <key>IBLockedObjects</key>
-        <array>

trunk/Resources/info.colloquy.plist

@@ -3 +3 @@
-<plist version="0.9">
-<dict>
-SidebarSplitViewPosition
-string>{{0, 0}, {173, 378}};{{174, 0}, {437, 378}}</string
+ChatWindowInterface
+integer>2</integer
-        <key>JVChatTranscriptFolder</key>
-        <string>~/Documents/Colloquy Transcripts</string>

trunk/Views/JVSideSplitView.m

@@ -2 +2 @@
-
-@implementation JVSideSplitView
+- (id) initWithCoder:(NSCoder *) decoder {
+        if( ( self = [super initWithCoder:decoder] ) )
+                _mainSubviewIndex = 1;
+        return self;
+}
+
-- (float) dividerThickness {
-        return 1.0;
@@ -14 +20 @@
-        NSRectFill( rect );
-}
+
+- (void) resizeSubviewsWithOldSize:(NSSize) oldSize {
+        [self adjustSubviews];
+}
+
+- (void) adjustSubviews {
+        if( _mainSubviewIndex == -1 || [[self subviews] count] != 2 ) {
+                [super adjustSubviews];
+                return;
+        }
+
+        float dividerThickness = [self dividerThickness];
+        NSRect newFrame = [self frame];
+
+        NSView *mainView = [[self subviews] objectAtIndex:_mainSubviewIndex];
+        NSView *otherView = ( _mainSubviewIndex ? [[self subviews] objectAtIndex:0] : [[self subviews] objectAtIndex:1] );
+
+        NSRect mainFrame = [mainView frame];
+        NSRect otherFrame = [otherView frame];
+
+        if( [self isVertical] ) {
+                mainFrame.size.width = NSWidth( newFrame ) - dividerThickness - NSWidth( otherFrame );
+                mainFrame.size.height = NSHeight( newFrame );
+                mainFrame.origin.x = ( _mainSubviewIndex ? NSWidth( otherFrame ) + dividerThickness : 0. );
+                mainFrame.origin.y = 0.;
+        } else {
+                mainFrame.size.width = NSWidth( newFrame );
+                mainFrame.size.height = NSHeight( newFrame ) - dividerThickness - NSHeight( otherFrame );
+                mainFrame.origin.x = 0.;
+                mainFrame.origin.y = ( _mainSubviewIndex ? NSHeight( otherFrame ) + dividerThickness : 0. );
+        }
+
+        if( [self isVertical] ) {
+                otherFrame.size.width = NSWidth( otherFrame );
+                otherFrame.size.height = NSHeight( newFrame );
+                otherFrame.origin.x = ( _mainSubviewIndex ? 0. : NSWidth( mainFrame ) + dividerThickness );
+                otherFrame.origin.y = 0.;
+        } else {
+                otherFrame.size.width = NSWidth( newFrame );
+                otherFrame.size.height = NSHeight( otherFrame );
+                otherFrame.origin.x = 0.;
+                otherFrame.origin.y = ( _mainSubviewIndex ? 0. : NSWidth( mainFrame ) + dividerThickness );
+        }
+
+        [mainView setFrame:mainFrame];
+        [otherView setFrame:otherFrame];
+
+        [self setNeedsDisplay:YES];
+}
-@end

trunk/Views/JVSplitView.m

@@ -83 +83 @@
-        } else [super drawDividerInRect:rect];
-}
-
-#pragma mark -
-
-- (void) adjustSubviews {
-        if( _mainSubviewIndex == -1 || [[self subviews] count] != 2 ) {
-                [super adjustSubviews];
-                return;
-        }
-
-        float dividerThickness = [self dividerThickness];
-        NSRect newFrame = [self frame];
-
-        NSView *mainView = [[self subviews] objectAtIndex:_mainSubviewIndex];
-        NSView *otherView = ( _mainSubviewIndex ? [[self subviews] objectAtIndex:0] : [[self subviews] objectAtIndex:1] );
-
-        NSRect mainFrame = [mainView frame];
-        NSRect otherFrame = [otherView frame];
-
-        if( [self isVertical] ) {
-                mainFrame.size.width = NSWidth( newFrame ) - dividerThickness - NSWidth( otherFrame );
-                mainFrame.size.height = NSHeight( newFrame );
-                mainFrame.origin.x = ( _mainSubviewIndex ? NSWidth( otherFrame ) + dividerThickness : 0. );
-                mainFrame.origin.y = 0.;
-        } else {
-                mainFrame.size.width = NSWidth( newFrame );
-                mainFrame.size.height = NSHeight( newFrame ) - dividerThickness - NSHeight( otherFrame );
-                mainFrame.origin.x = 0.;
-                mainFrame.origin.y = ( _mainSubviewIndex ? NSHeight( otherFrame ) + dividerThickness : 0. );
-        }
-
-        if( [self isVertical] ) {
-                otherFrame.size.width = NSWidth( otherFrame );
-                otherFrame.size.height = NSHeight( newFrame );
-                otherFrame.origin.x = ( _mainSubviewIndex ? 0. : NSWidth( mainFrame ) + dividerThickness );
-                otherFrame.origin.y = 0.;
-        } else {
-                otherFrame.size.width = NSWidth( newFrame );
-                otherFrame.size.height = NSHeight( otherFrame );
-                otherFrame.origin.x = 0.;
-                otherFrame.origin.y = ( _mainSubviewIndex ? 0. : NSWidth( mainFrame ) + dividerThickness );
-        }
-
-        [mainView setFrame:mainFrame];
-        [otherView setFrame:otherFrame];
-
-        NSLog( @"%f  %@   %@", dividerThickness, NSStringFromRect( otherFrame ), NSStringFromRect( mainFrame ) );
-
-        if( ! ( [self inLiveResize] && [self preservesContentDuringLiveResize] ) )
-                [self setNeedsDisplay:YES];
-}
-@end