mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 20:40:47 +00:00
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:
parent
bb6792671e
commit
4aec81bc53
2 changed files with 21 additions and 3 deletions
|
@ -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>
|
2010-02-12 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||||
|
|
||||||
* Source/NSTextView_actions.m (killBuffer, -deleteToEndOfLine:,
|
* Source/NSTextView_actions.m (killBuffer, -deleteToEndOfLine:,
|
||||||
|
|
|
@ -142,11 +142,23 @@
|
||||||
NSDebugLLog(@"GSTitleView", @"owner is NSMenu");
|
NSDebugLLog(@"GSTitleView", @"owner is NSMenu");
|
||||||
_owner = owner;
|
_owner = owner;
|
||||||
_ownedByMenu = YES;
|
_ownedByMenu = YES;
|
||||||
|
NSColor *textColor;
|
||||||
|
GSTheme *theme = [GSTheme theme];
|
||||||
|
|
||||||
RELEASE (titleColor);
|
RELEASE (titleColor);
|
||||||
titleColor = RETAIN ([NSColor blackColor]);
|
titleColor = RETAIN ([theme colorNamed: @"GSMenuBar" state: GSThemeNormalState]);
|
||||||
[textAttributes setObject: [NSColor whiteColor]
|
if (titleColor == nil)
|
||||||
forKey: NSForegroundColorAttributeName];
|
{
|
||||||
|
titleColor = RETAIN ([NSColor blackColor]);
|
||||||
|
}
|
||||||
|
|
||||||
|
textColor = [theme colorNamed: @"GSMenuBarTitle" state: GSThemeNormalState];
|
||||||
|
if (textColor == nil)
|
||||||
|
{
|
||||||
|
textColor = [NSColor whiteColor];
|
||||||
|
}
|
||||||
|
[textAttributes setObject: textColor
|
||||||
|
forKey: NSForegroundColorAttributeName];
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue