gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfixes for adding/removing accessory views.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12964 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-03-04 09:57:29 +00:00
parent 158950ecba
commit beab02dd7a
2 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-03-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSavePanel.m: Hack around accessory view addition/removal
code - fix a few bugs and simplify by relying more on autoresizing
and less on manual computation of resizing values. Now works with
ProjectCentre on my system.
2002-03-03 Gregory Casamento <greg_casamento@yahoo.com>
* Images/common_outlineUnexpandable.tiff added.

33
Source/NSSavePanel.m
View file

@ -108,7 +108,7 @@ static BOOL _gs_display_reading_progress = NO;
r = NSMakeRect (0, 0, 308, 64);
_bottomView = [[NSView alloc] initWithFrame: r];
[_bottomView setBounds: r];
[_bottomView setAutoresizingMask: NSViewWidthSizable];
[_bottomView setAutoresizingMask: NSViewWidthSizable|NSViewMaxYMargin];
[_bottomView setAutoresizesSubviews: YES];
[[self contentView] addSubview: _bottomView];
[_bottomView release];
@ -500,7 +500,7 @@ static BOOL _gs_display_reading_progress = NO;
- (void) setAccessoryView: (NSView*)aView
{
NSRect accessoryViewFrame, bottomFrame, topFrame;
NSRect accessoryViewFrame, bottomFrame;
NSRect tmpRect;
NSSize contentSize, contentMinSize;
float addedHeight, accessoryWidth;
@ -529,16 +529,9 @@ static BOOL _gs_display_reading_progress = NO;
contentSize = [[self contentView] frame].size;
contentSize.height -= addedHeight;
// Resize without modifying topView and bottomView height.
[_topView setAutoresizingMask: NSViewWidthSizable];
[_bottomView setAutoresizingMask: NSViewWidthSizable];
[_topView setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin];
[self setContentSize: contentSize];
[_topView setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
[_bottomView setAutoresizingMask: NSViewWidthSizable];
/* Move top view to its position without accessory view */
topFrame = [_topView frame];
topFrame.origin.y -= addedHeight;
[_topView setFrameOrigin: topFrame.origin];
}
/* Resize the panel to its original size. This resizes freely the
@ -552,11 +545,12 @@ static BOOL _gs_display_reading_progress = NO;
/* If there is a new accessory view, plug it in */
if (_accessoryView != nil)
{
/* Make sure the new accessory view behaves */
[_accessoryView setAutoresizingMask: ([_accessoryView autoresizingMask]
& !NSViewHeightSizable
& !NSViewMaxYMargin
& !NSViewMinYMargin)];
/* Make sure the new accessory view behaves - its height must be fixed
* and its position relative to the bottom of the superview must not
* change */
[_accessoryView setAutoresizingMask: NSViewMaxYMargin
| ([_accessoryView autoresizingMask]
& ~(NSViewHeightSizable | NSViewMinYMargin))];
/* Compute size taken by the new accessory view */
accessoryViewFrame = [_accessoryView frame];
@ -573,12 +567,10 @@ static BOOL _gs_display_reading_progress = NO;
/* Set new content size without resizing heights of topView, bottomView */
// Our views should resize horizontally if needed, but not vertically
[_topView setAutoresizingMask: NSViewWidthSizable];
[_bottomView setAutoresizingMask: NSViewWidthSizable];
[_topView setAutoresizingMask: NSViewWidthSizable | NSViewMinYMargin];
[self setContentSize: contentSize];
// Restore the original autoresizing masks
[_topView setAutoresizingMask: NSViewWidthSizable|NSViewHeightSizable];
[_bottomView setAutoresizingMask: NSViewWidthSizable];
/* Compute new min size */
contentMinSize = _originalMinSize;
@ -607,11 +599,6 @@ static BOOL _gs_display_reading_progress = NO;
accessoryViewFrame.origin.y = NSMaxY (bottomFrame) + _SAVE_PANEL_Y_PAD;
[_accessoryView setFrameOrigin: accessoryViewFrame.origin];
/* TopView */
topFrame = [_topView frame];
topFrame.origin.y += addedHeight;
[_topView setFrameOrigin: topFrame.origin];
/* Add the accessory view */
[[self contentView] addSubview: _accessoryView];
}