* Source/GSTheme.m (-drawButton:view:style:state:): Call

[drawButton:withClip:] instead of [drawGreyBezel:withClip:] if
  state is highlighted (e.g. scroller buttons).



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24388 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
stoyan 2007-01-19 20:13:04 +00:00
parent 89b1a1133c
commit 4f53bd35bc
3 changed files with 8 additions and 6 deletions

View file

@ -1,3 +1,9 @@
2007-01-19 Sergii Stoian <stoyan255@gmail.com>
* Source/GSTheme.m (-drawButton:view:style:state:): Call
[drawButton:withClip:] instead of [drawGreyBezel:withClip:] if
state is highlighted (e.g. scroller buttons).
2007-01-19 Fred Kiefer <FredKiefer@gmx.de> 2007-01-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSPopUpButton.m (-keyDown:): Handle selection of first * Source/NSPopUpButton.m (-keyDown:): Handle selection of first

View file

@ -723,14 +723,10 @@ static NSNull *null = nil;
[color set]; [color set];
NSRectFill(frame); NSRectFill(frame);
if (state == GSThemeNormalState) if (state == GSThemeNormalState || state == GSThemeHighlightedState)
{ {
[self drawButton: frame withClip: NSZeroRect]; [self drawButton: frame withClip: NSZeroRect];
} }
else if (state == GSThemeHighlightedState)
{
[self drawGrayBezel: frame withClip: NSZeroRect];
}
else if (state == GSThemeSelectedState) else if (state == GSThemeSelectedState)
{ {
[self drawGrayBezel: frame withClip: NSZeroRect]; [self drawGrayBezel: frame withClip: NSZeroRect];

View file

@ -1103,7 +1103,7 @@ typedef struct _GSButtonCellFlags
case NSNoImage: case NSNoImage:
imageToDisplay = nil; imageToDisplay = nil;
titleRect = cellFrame; titleRect = cellFrame;
imageRect = NSZeroRect; imageRect = NSZeroRect;
if (titleSize.width + 6 <= titleRect.size.width) if (titleSize.width + 6 <= titleRect.size.width)
{ {
titleRect.origin.x += 3; titleRect.origin.x += 3;