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

Redraw only the necessary parts; tiny other speedups.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7358 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2000-09-03 19:30:19 +00:00
parent 20951887f8
commit 673b8f48db
1 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Source/NSScroller.m
View file

@ -60,6 +60,7 @@ static NSButtonCell* knobCell = nil;
static const float scrollerWidth = 18;
static const float buttonsWidth = 16;
static NSColor *scrollBarColor = nil;
/*
* Class methods
@ -67,7 +68,10 @@ static const float buttonsWidth = 16;
+ (void) initialize
{
if (self == [NSScroller class])
[self setVersion: 1];
{
[self setVersion: 1];
ASSIGN (scrollBarColor, [NSColor scrollBarColor]);
}
}
+ (float) scrollerWidth
@ -280,6 +284,7 @@ static const float buttonsWidth = 16;
return;
_isEnabled = flag;
_cacheValid = NO;
[self setNeedsDisplay: YES];
}
@ -289,6 +294,7 @@ static const float buttonsWidth = 16;
return;
_arrowsPosition = where;
_cacheValid = NO;
[self setNeedsDisplay: YES];
}
@ -340,6 +346,7 @@ static const float buttonsWidth = 16;
_arrowsPosition = NSScrollerArrowsMaxEnd;
_hitPart = NSScrollerNoPart;
_cacheValid = NO;
[self checkSpaceForParts];
}
@ -347,6 +354,7 @@ static const float buttonsWidth = 16;
{
[super setFrameSize: size];
[self checkSpaceForParts];
_cacheValid = NO;
[self setNeedsDisplay: YES];
}
@ -645,17 +653,34 @@ static const float buttonsWidth = 16;
*/
- (void) drawRect: (NSRect)rect
{
NSDebugLog (@"NSScroller drawRect: ((%f, %f), (%f, %f))",
rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
static NSRect rectForPartIncrementLine;
static NSRect rectForPartDecrementLine;
static NSRect rectForPartKnobSlot;
if (_cacheValid == NO)
{
rectForPartIncrementLine = [self rectForPart: NSScrollerIncrementLine];
rectForPartDecrementLine = [self rectForPart: NSScrollerDecrementLine];
rectForPartKnobSlot = [self rectForPart: NSScrollerKnobSlot];
}
[[_window backgroundColor] set];
NSRectFill (_bounds);
NSRectFill (rect);
[self drawKnobSlot];
[self drawKnob];
if (NSIntersectsRect (rect, rectForPartKnobSlot) == YES)
{
[self drawKnobSlot];
[self drawKnob];
}
[self drawArrow: NSScrollerDecrementArrow highlight: NO];
[self drawArrow: NSScrollerIncrementArrow highlight: NO];
if (NSIntersectsRect (rect, rectForPartDecrementLine) == YES)
{
[self drawArrow: NSScrollerDecrementArrow highlight: NO];
}
if (NSIntersectsRect (rect, rectForPartIncrementLine) == YES)
{
[self drawArrow: NSScrollerIncrementArrow highlight: NO];
}
}
- (void) drawArrow: (NSScrollerArrow)whichButton highlight: (BOOL)flag
@ -688,12 +713,15 @@ static const float buttonsWidth = 16;
- (void) drawKnobSlot
{
NSRect rect;
static NSRect rect;
rect = [self rectForPart: NSScrollerKnobSlot];
if (_cacheValid == NO)
{
rect = [self rectForPart: NSScrollerKnobSlot];
}
[[NSColor scrollBarColor] set];
NSRectFill(rect);
[scrollBarColor set];
NSRectFill (rect);
}
- (void) highlight: (BOOL)flag