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

* Source/NSScrollView.m: If the scrollview has scrollers,

Browse source 
don't pay attention to the hidden flag in nib loading.
	* Source/NSTableView.m: if the table has a cornerview, don't
	pay attention to the hidden flag in nib loading.  
	NOTE: In both instances it appears that Cocoa sets the hidden flag 
	when autohide is set to true.   GNUstep handles this case differently,
	so it's okay to ignore this flag when the scroller is in an
	NSScrollView.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28231 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
gcasa 2009-04-19 03:23:11 +00:00
parent d1db66cd7c
commit 6ea6f0f5e2
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2009-04-18 23:21-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSScrollView.m: If the scrollview has scrollers,
don't pay attention to the hidden flag in nib loading.
* Source/NSTableView.m: if the table has a cornerview, don't
pay attention to the hidden flag in nib loading.
NOTE: In both instances it appears that Cocoa sets the hidden flag
when autohide is set to true. GNUstep handles this case differently,
so it's okay to ignore this flag when the scroller is in an
NSScrollView.
2009-04-16 16:05-EDT Gregory John Casamento <greg.casamento@gmail.com> 2009-04-16 16:05-EDT Gregory John Casamento <greg.casamento@gmail.com>
* Source/NSAlert.m: Revert last change. * Source/NSAlert.m: Revert last change.

12
Source/NSScrollView.m
View file

@ -1561,7 +1561,7 @@ static float scrollerWidth;
if (content != nil) if (content != nil)
{ {
// FIXME: I think this is not needed as we re-tile anyway. // Move the content view since it is not moved when we retile.
NSRect frame = [content frame]; NSRect frame = [content frame];
float w = [vScroller frame].size.width; float w = [vScroller frame].size.width;
@ -1575,19 +1575,18 @@ static float scrollerWidth;
frame.origin.x += w; frame.origin.x += w;
[content setFrame: frame]; [content setFrame: frame];
} }
// set the document view into the content.
[self setContentView: content];
} }
if (hScroller != nil && _hasHorizScroller) if (hScroller != nil && _hasHorizScroller)
{ {
[self setHorizontalScroller: hScroller]; [self setHorizontalScroller: hScroller];
[hScroller setHidden: NO];
} }
if (vScroller != nil && _hasVertScroller) if (vScroller != nil && _hasVertScroller)
{ {
[self setVerticalScroller: vScroller]; [self setVerticalScroller: vScroller];
[vScroller setHidden: NO];
} }
if ([aDecoder containsValueForKey: @"NSHeaderClipView"]) if ([aDecoder containsValueForKey: @"NSHeaderClipView"])
@ -1596,7 +1595,10 @@ static float scrollerWidth;
_headerClipView = [aDecoder decodeObjectForKey: @"NSHeaderClipView"]; _headerClipView = [aDecoder decodeObjectForKey: @"NSHeaderClipView"];
} }
[self tile]; // [self tile];
// set the document view into the content.
[self addSubview: vScroller];
[self setContentView: content];
[docView setPostsFrameChangedNotifications: post_frame]; [docView setPostsFrameChangedNotifications: post_frame];
[docView setPostsBoundsChangedNotifications: post_bound]; [docView setPostsBoundsChangedNotifications: post_bound];
} }

4
Source/NSTableView.m
View file

@ -5746,7 +5746,9 @@ static BOOL selectContiguousRegion(NSTableView *self,
forClassName: @"_NSCornerView"]; forClassName: @"_NSCornerView"];
if ([aDecoder containsValueForKey: @"NSCornerView"]) if ([aDecoder containsValueForKey: @"NSCornerView"])
{ {
[self setCornerView: [aDecoder decodeObjectForKey: @"NSCornerView"]]; NSView *aView = [aDecoder decodeObjectForKey: @"NSCornerView"];
[self setCornerView: aView];
[aView setHidden: NO];
} }
else else
{ {