diff --git a/ChangeLog b/ChangeLog index f89b6e058..2d80ffc3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-05-23 11:48-EDT Gregory John Casamento + + * Source/GSStandardWindowDecorationView.m: Live window resize changes + for when using GNUstep decorations in resizeWindowStartingWithEvent:. + * Source/NSLayoutManager.m: Unarchive the text containers into an + array in initWithCoder:. + * Source/NSTextContainer.m: Get the layout manager in initWithCoder:. + * Source/NSTextView.m: Changes to include text container from nib + file into the nib loading process in initWithCoder:. + 2009-05-22 Nicolas Roard Add a live resize for splitviews. Users can revert to the old behaviour by doing: defaults write NSGlobalDomain GSUseGhostResize YES @@ -5,7 +15,8 @@ 2009-05-14 Riccardo Mottola - * Source/NSApplication.m: fixed allocation of Mutable array instead of Array + * Source/NSApplication.m: fixed allocation of Mutable array instead of + Array 2009-05-14 14:15-EDT Gregory John Casamento @@ -2425,8 +2436,8 @@ 2008-05-03 Fred Kiefer * Source/NSTableView.m (-selectRow:byExtendingSelection:, - -selectColumn:byExtendingSelection:, -rectOfColumn:, -rectOfRow:): Don't - raise an exception for invalid indexes. + -selectColumn:byExtendingSelection:, -rectOfColumn:, -rectOfRow:): + Don't raise an exception for invalid indexes. 2008-05-01 Fred Kiefer diff --git a/Source/GSStandardWindowDecorationView.m b/Source/GSStandardWindowDecorationView.m index 27ddcc1fa..9f710ec2d 100644 --- a/Source/GSStandardWindowDecorationView.m +++ b/Source/GSStandardWindowDecorationView.m @@ -467,6 +467,7 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint, NSPoint firstPoint, point; NSRect newFrame, frame; NSSize minSize, maxSize; + int num = 0; /* 0 drag lower left corner @@ -513,6 +514,13 @@ calc_new_frame(NSRect frame, NSPoint point, NSPoint firstPoint, untilDate: [NSDate distantFuture] inMode: NSEventTrackingRunLoopMode dequeue: YES]; + + num++; + if(num == 5) + { + [window setFrame: newFrame display: YES]; + num = 0; + } } while ([currentEvent type] != NSLeftMouseUp); [window _releaseMouse: nil]; diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m index 69abad623..4764583dc 100644 --- a/Source/NSLayoutManager.m +++ b/Source/NSLayoutManager.m @@ -2292,7 +2292,6 @@ no_soft_invalidation: if ([aDecoder allowsKeyedCoding]) { - /* int i; int flags; NSArray *array = [aDecoder decodeObjectForKey: @"NSTextContainers"]; @@ -2312,7 +2311,6 @@ no_soft_invalidation: { [self addTextContainer: [array objectAtIndex: i]]; } - */ return self; } else diff --git a/Source/NSTextContainer.m b/Source/NSTextContainer.m index 9c5a20786..4222dd586 100644 --- a/Source/NSTextContainer.m +++ b/Source/NSTextContainer.m @@ -473,7 +473,11 @@ framework intact. } // decoding the manager adds this text container automatically... - [aDecoder decodeObjectForKey: @"NSLayoutManager"]; + if ([aDecoder containsValueForKey: @"NSLayoutManager"]) + { + _layoutManager = [aDecoder decodeObjectForKey: @"NSLayoutManager"]; + } + [self setTextView: view]; return self; } diff --git a/Source/NSTextView.m b/Source/NSTextView.m index 2f07e4242..daed59827 100644 --- a/Source/NSTextView.m +++ b/Source/NSTextView.m @@ -852,16 +852,19 @@ that makes decoding and encoding compatible with the old code. // currently not used.... if ([aDecoder containsValueForKey: @"NSTextContainer"]) - { + { + /* NSSize size = NSMakeSize(0,_maxSize.height); NSTextContainer *aTextContainer = [self buildUpTextNetwork: NSZeroSize]; [aTextContainer setTextView: (NSTextView *)self]; - /* See initWithFrame: for comments on this RELEASE */ + // See initWithFrame: for comments on this RELEASE RELEASE(self); [aTextContainer setContainerSize: size]; [aTextContainer setWidthTracksTextView: YES]; [aTextContainer setHeightTracksTextView: NO]; + */ + _textContainer = [aDecoder decodeObjectForKey: @"NSTextContainer"]; } if ([aDecoder containsValueForKey: @"NSTVFlags"])