Search extra colors for the menu bar in the theme

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@29591 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Germán Arias 2010-02-12 17:56:11 +00:00
parent 9eb497b703
commit 8d25516577
2 changed files with 21 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2010-02-12 German Arias <german@xelalug.org>
* Source/GSTitleView.m: Search in theme colors: GSMenuBar and
GSMenuBarTitle (both GSThemeNormalState). If not present, set
black and white respectively.
2010-02-12 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/NSTextView_actions.m (killBuffer, -deleteToEndOfLine:,

View file

@ -142,11 +142,23 @@
NSDebugLLog(@"GSTitleView", @"owner is NSMenu");
_owner = owner;
_ownedByMenu = YES;
NSColor *textColor;
GSTheme *theme = [GSTheme theme];
RELEASE (titleColor);
titleColor = RETAIN ([NSColor blackColor]);
[textAttributes setObject: [NSColor whiteColor]
forKey: NSForegroundColorAttributeName];
titleColor = RETAIN ([theme colorNamed: @"GSMenuBar" state: GSThemeNormalState]);
if (titleColor == nil)
{
titleColor = RETAIN ([NSColor blackColor]);
}
textColor = [theme colorNamed: @"GSMenuBarTitle" state: GSThemeNormalState];
if (textColor == nil)
{
textColor = [NSColor whiteColor];
}
[textAttributes setObject: textColor
forKey: NSForegroundColorAttributeName];
}
else
{