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

Avoid crashing from removal of subview.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13051 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-03-08 17:38:23 +00:00
parent 1bde23cc34
commit 0c5d456641
2 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2002-03-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSScrollView.m: Go through adding checks to avoid crashes
where _contentView has been set to nil through removal of the
subview.
Thu Mar 7 08:29:25 2002 Nicola Pero <n.pero@mi.flashnet.it>
* Source/NSScrollView.m ([-dealloc]): Use DESTROY, not

62
Source/NSScrollView.m
View file

@ -186,7 +186,9 @@ static float scrollerWidth;
[self addSubview: _contentView];
if (docView != nil)
[self setDocumentView: docView];
{
[self setDocumentView: docView];
}
}
[_contentView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[self tile];
@ -197,13 +199,8 @@ static float scrollerWidth;
if (aView == _contentView)
{
_contentView = nil;
[super removeSubview: aView];
[self tile];
}
else
{
[super removeSubview: aView];
}
[super removeSubview: aView];
}
- (void) setHorizontalScroller: (NSScroller*)aScroller
@ -292,12 +289,20 @@ static float scrollerWidth;
- (void) scrollWheel: (NSEvent *)theEvent
{
NSRect clipViewBounds = [_contentView bounds];
float deltaY = [theEvent deltaY];
float amount;
NSPoint point = clipViewBounds.origin;
NSRect clipViewBounds;
float deltaY = [theEvent deltaY];
float amount;
NSPoint point;
if (_contentView == nil)
{
clipViewBounds = NSZeroRect;
}
else
{
clipViewBounds = [_contentView bounds];
}
point = clipViewBounds.origin;
if (([theEvent modifierFlags] & NSAlternateKeyMask) == NSAlternateKeyMask)
{
amount = - (clipViewBounds.size.height - _vPageScroll) * deltaY;
@ -307,13 +312,14 @@ static float scrollerWidth;
amount = - _vLineScroll * deltaY;
}
if (!_contentView->_rFlags.flipped_view)
if (_contentView != nil && !_contentView->_rFlags.flipped_view)
{
/* If view is flipped reverse the scroll direction */
amount = -amount;
}
NSDebugLog (@"increment/decrement: amount = %f, flipped = %d",
amount, _contentView->_rFlags.flipped_view);
amount, _contentView ? _contentView->_rFlags.flipped_view : 0);
point.y = clipViewBounds.origin.y + amount;
if (_hasHeaderView)
@ -343,11 +349,23 @@ static float scrollerWidth;
- (void) _doScroll: (NSScroller*)scroller
{
float floatValue = [scroller floatValue];
NSRect clipViewBounds = [_contentView bounds];
NSScrollerPart hitPart = [scroller hitPart];
NSRect documentRect = [_contentView documentRect];
NSRect clipViewBounds;
NSRect documentRect;
float amount = 0;
NSPoint point = clipViewBounds.origin;
NSPoint point;
if (_contentView == nil)
{
clipViewBounds = NSZeroRect;
documentRect = NSZeroRect;
}
else
{
clipViewBounds = [_contentView bounds];
documentRect = [_contentView documentRect];
}
point = clipViewBounds.origin;
NSDebugLog (@"_doScroll: float value = %f", floatValue);
@ -403,13 +421,13 @@ static float scrollerWidth;
}
else
{
if (!_contentView->_rFlags.flipped_view)
if (_contentView != nil && !_contentView->_rFlags.flipped_view)
{
/* If view is flipped reverse the scroll direction */
amount = -amount;
}
NSDebugLog (@"increment/decrement: amount = %f, flipped = %d",
amount, _contentView->_rFlags.flipped_view);
amount, _contentView ? _contentView->_rFlags.flipped_view : 0);
point.y = clipViewBounds.origin.y + amount;
}
}
@ -423,10 +441,10 @@ static float scrollerWidth;
}
else
{
if (!_contentView->_rFlags.flipped_view)
if (_contentView != nil && !_contentView->_rFlags.flipped_view)
floatValue = 1 - floatValue;
point.y = floatValue * (documentRect.size.height
- clipViewBounds.size.height);
- clipViewBounds.size.height);
point.y += documentRect.origin.y;
}
}
@ -919,7 +937,7 @@ static float scrollerWidth;
if (_hasCornerView == YES)
{
[self removeSubview:
[(NSTableView *)[_contentView documentView] cornerView]];
[(NSTableView *)[_contentView documentView] cornerView]];
}
_hasCornerView = ([aView respondsToSelector: @selector(cornerView)]
&& ([(NSTableView *)aView cornerView] != nil));