зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1169233
- Get grey (inactive) text color from menu labels. r=karlt
This commit is contained in:
Родитель
3626e5799b
Коммит
649e670ec4
|
@ -243,9 +243,7 @@ nsLookAndFeel::NativeGetColor(ColorID aID, nscolor& aColor)
|
|||
break;
|
||||
case eColorID_graytext: // disabled text in windows, menus, etc.
|
||||
case eColorID_inactivecaptiontext: // text in inactive window caption
|
||||
gtk_style_context_get_color(mBackgroundStyle,
|
||||
GTK_STATE_FLAG_INSENSITIVE, &gdk_color);
|
||||
aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
|
||||
aColor = sMenuTextInactive;
|
||||
break;
|
||||
case eColorID_inactivecaption:
|
||||
// inactive window caption
|
||||
|
@ -1029,6 +1027,8 @@ nsLookAndFeel::Init()
|
|||
style = gtk_widget_get_style_context(accel_label);
|
||||
gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
sMenuText = GDK_RGBA_TO_NS_RGBA(color);
|
||||
gtk_style_context_get_color(style, GTK_STATE_FLAG_INSENSITIVE, &color);
|
||||
sMenuTextInactive = GDK_RGBA_TO_NS_RGBA(color);
|
||||
|
||||
style = gtk_widget_get_style_context(menu);
|
||||
gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
|
||||
|
|
|
@ -59,6 +59,7 @@ protected:
|
|||
nscolor sMenuBarText;
|
||||
nscolor sMenuBarHoverText;
|
||||
nscolor sMenuText;
|
||||
nscolor sMenuTextInactive;
|
||||
nscolor sMenuHover;
|
||||
nscolor sMenuHoverText;
|
||||
nscolor sButtonText;
|
||||
|
|
Загрузка…
Ссылка в новой задаче