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

Cache whether it's opaque or not; minor changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@8613 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2001-01-16 12:31:22 +00:00
parent 1a361e62d3
commit 5c5f8f4732
1 changed files with 45 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
Source/NSClipView.m
View file

@ -66,11 +66,11 @@
nc = [NSNotificationCenter defaultCenter];
if (_documentView)
{
[nc removeObserver: self name: nil object: _documentView];
[nc removeObserver: self name: nil object: _documentView];
[_documentView removeFromSuperview];
}
ASSIGN(_documentView, aView);
ASSIGN (_documentView, aView);
if (_documentView)
{
@ -78,12 +78,21 @@
[self addSubview: _documentView];
/* Call this before setting bounds origin ! */
_rFlags.flipped_view = [self isFlipped];
df = [_documentView frame];
[self setBoundsOrigin: df.origin];
if ([aView respondsToSelector: @selector(backgroundColor)])
[self setBackgroundColor: [(id)aView backgroundColor]];
{
[self setBackgroundColor: [(id)aView backgroundColor]];
}
if ([aView respondsToSelector: @selector(drawsBackground)])
[self setDrawsBackground: [(id)aView drawsBackground]];
{
[self setDrawsBackground: [(id)aView drawsBackground]];
}
/* Register for notifications sent by the document view */
[_documentView setPostsFrameChangedNotifications: YES];
@ -101,6 +110,8 @@
_rFlags.flipped_view = [self isFlipped];
/* TODO: Adjust the key view loop to include the new document view */
[_super_view reflectScrolledClipView: self];
}
@ -122,7 +133,7 @@
newBounds.origin = point;
if (NSEqualPoints(originalBounds.origin, newBounds.origin))
if (NSEqualPoints (originalBounds.origin, newBounds.origin))
return;
if (_documentView == nil)
@ -140,7 +151,7 @@
// no intersection -- docview should draw everything
[super setBoundsOrigin: newBounds.origin];
[_documentView setNeedsDisplayInRect:
[self convertRect: newBounds toView: _documentView]];
[self documentVisibleRect]];
}
else
{
@ -211,7 +222,7 @@
// dont copy anything -- docview draws it all
[super setBoundsOrigin: newBounds.origin];
[_documentView setNeedsDisplayInRect:
[self convertRect: newBounds toView: _documentView]];
[self documentVisibleRect]];
}
if ([NSView focusView] == _documentView)
@ -283,8 +294,8 @@
return NSZeroRect;
documentBounds = [_documentView bounds];
clipViewBounds = [self convertRect: _bounds toView: _documentView];
rect = NSIntersectionRect(documentBounds, clipViewBounds);
clipViewBounds = [self convertRect: _bounds toView: _documentView];
rect = NSIntersectionRect (documentBounds, clipViewBounds);
return rect;
}
@ -389,7 +400,7 @@
- (void) setDocumentCursor: (NSCursor*)aCursor
{
ASSIGN(_cursor, aCursor);
ASSIGN (_cursor, aCursor);
}
- (NSCursor*) documentCursor
@ -404,27 +415,42 @@
- (void) setBackgroundColor: (NSColor*)aColor
{
ASSIGN(_backgroundColor, aColor);
ASSIGN (_backgroundColor, aColor);
if (_drawsBackground == NO || _backgroundColor == nil
|| [_backgroundColor alphaComponent] < 1.0)
{
_isOpaque = NO;
}
else
{
_isOpaque = YES;
}
}
- (void)setDrawsBackground:(BOOL)flag
- (void) setDrawsBackground:(BOOL)flag
{
_drawsBackground = flag;
if (_drawsBackground == NO || _backgroundColor == nil
|| [_backgroundColor alphaComponent] < 1.0)
{
_isOpaque = NO;
}
else
{
_isOpaque = YES;
}
}
- (BOOL)drawsBackground
- (BOOL) drawsBackground
{
return _drawsBackground;
}
- (BOOL) isOpaque
{
if (_drawsBackground == NO
|| _backgroundColor == nil
|| [_backgroundColor alphaComponent] < 1.0)
return NO;
else
return YES;
return _isOpaque;
}
- (BOOL) isFlipped