gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Missing changes from last commit.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25304 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-07-04 12:36:21 +00:00
parent 28aafc0b45
commit 1b0f4ef79a
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/NSView.m
View file

@ -1689,15 +1689,15 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
id e, o; id e, o;
if (_autoresizes_subviews == NO || _is_rotated_from_base == YES) if (_autoresizes_subviews == NO || _is_rotated_from_base == YES)
return; return;
e = [_sub_views objectEnumerator]; e = [_sub_views objectEnumerator];
o = [e nextObject]; o = [e nextObject];
while (o) while (o)
{ {
[o resizeWithOldSuperviewSize: oldSize]; [o resizeWithOldSuperviewSize: oldSize];
o = [e nextObject]; o = [e nextObject];
} }
} }
} }
@ -1905,7 +1905,9 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
* than the bounds of the view. This prevents drawing outside * than the bounds of the view. This prevents drawing outside
* our bounds. * our bounds.
*/ */
if (_is_rotated_from_base) // Normally the second test is not needed, it can differ only
// when the view is loaded from a NIB file.
if (_is_rotated_from_base && (_boundsMatrix != nil))
{ {
// When the view is rotated, we clip to the frame. // When the view is rotated, we clip to the frame.
NSAffineTransform *matrix; NSAffineTransform *matrix;
@ -1915,7 +1917,7 @@ convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matrix1,
frame.origin = NSMakePoint(0, 0); frame.origin = NSMakePoint(0, 0);
bp = [NSBezierPath bezierPathWithRect: frame]; bp = [NSBezierPath bezierPathWithRect: frame];
matrix = [_boundsMatrix copy]; matrix = [_boundsMatrix copy];
[matrix invert]; [matrix invert];
[bp transformUsingAffineTransform: matrix]; [bp transformUsingAffineTransform: matrix];
[bp addClip]; [bp addClip];
@ -4180,15 +4182,15 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
// add the autoresize flag. // add the autoresize flag.
if (_autoresizes_subviews) if (_autoresizes_subviews)
{ {
vFlags |= 0x100; vFlags |= 0x100;
} }
// add the hidden flag // add the hidden flag
if (_is_hidden) if (_is_hidden)
{ {
vFlags |= 0x80000000; vFlags |= 0x80000000;
} }
[aCoder encodeInt: vFlags [aCoder encodeInt: vFlags
forKey: @"NSvFlags"]; forKey: @"NSvFlags"];
@ -4198,9 +4200,9 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
// content view for a window. // content view for a window.
// //
if (([[self window] contentView] != self) && _super_view != nil) if (([[self window] contentView] != self) && _super_view != nil)
{ {
[aCoder encodeObject: _super_view forKey: @"NSSuperview"]; [aCoder encodeObject: _super_view forKey: @"NSSuperview"];
} }
} }
else else
{ {