diff --git a/ChangeLog b/ChangeLog index 04906fc8a..13f18ed2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-02-12 German Arias + + * 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 * Source/NSTextView_actions.m (killBuffer, -deleteToEndOfLine:, diff --git a/Source/GSTitleView.m b/Source/GSTitleView.m index 18edae53a..68effd71b 100644 --- a/Source/GSTitleView.m +++ b/Source/GSTitleView.m @@ -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 {