* Source/NSTableHeaderCell.m (-drawInteriorWithFrame:inView:): Use

the correct background/highlight colors and NSCompositeSourceOver for
image cells.
(-setHighlighted): Use controlHighlightColor instead of controlColor.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@20533 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2005-01-09 16:12:14 +00:00
parent f43c0326c6
commit 3cbd603819
2 changed files with 13 additions and 6 deletions

View file

@ -1,3 +1,10 @@
2005-01-09 Matt Rice <ratmice@yahoo.com>
* Source/NSTableHeaderCell.m (-drawInteriorWithFrame:inView:): Use
the correct background/highlight colors and NSCompositeSourceOver for
image cells.
(-setHighlighted): Use controlHighlightColor instead of controlColor.
2004-12-30 Quentin Mathe <qmathe@club-internet.fr>
* Source/GSToolbarView.m: Modified to be more compliant with GNUstep

View file

@ -105,8 +105,8 @@ static NSColor *clearCol = nil;
// Initialize static colors if needed
if (clearCol == nil)
{
bgCol = RETAIN([NSColor selectedControlColor]);
hbgCol = RETAIN([NSColor controlBackgroundColor]);
bgCol = RETAIN([NSColor controlShadowColor]);
hbgCol = RETAIN([NSColor controlHighlightColor]);
clearCol = RETAIN([NSColor clearColor]);
}
// Prepare to draw
@ -117,9 +117,9 @@ static NSColor *clearCol = nil;
NSColor *bg;
if (_cell.is_highlighted)
bg = bgCol;
else
bg = hbgCol;
else
bg = bgCol;
[bg set];
NSRectFill (cellFrame);
}
@ -134,7 +134,7 @@ static NSColor *clearCol = nil;
position.y = MAX (NSMidY (cellFrame) - (size.height/2.), 0.);
if ([controlView isFlipped])
position.y += size.height;
[_cell_image compositeToPoint: position operation: NSCompositeCopy];
[_cell_image compositeToPoint: position operation: NSCompositeSourceOver];
}
// End the drawing
break;
@ -150,7 +150,7 @@ static NSColor *clearCol = nil;
if (flag == YES)
{
[self setBackgroundColor: [NSColor controlColor]];
[self setBackgroundColor: [NSColor controlHighlightColor]];
}
else
{