Added patch for mozbz#1169233 - Disabled menu items are not greyed out

2 files changed, 78 insertions, 1 deletions

diff --git a/firefox.spec b/firefox.spec
index 2558043..e4c6976 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        38.0.1
-Release:        4%{?pre_tag}%{?dist}
+Release:        5%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -159,6 +159,7 @@ Patch417:        mozilla-1144745-1.patch
 Patch418:        mozilla-1144745-2.patch
 Patch419:        mozilla-1144745-3.patch
 Patch420:        mozilla-1160154.patch
+Patch421:        mozilla-1169233.patch
 
 # Fix Skia Neon stuff on AArch64
 Patch500:        aarch64-fix-skia.patch
@@ -319,6 +320,7 @@ cd %{tarballdir}
 %patch418 -p1 -b .1144745-2
 %patch419 -p1 -b .1144745-3
 %patch420 -p1 -b .1160154
+%patch421 -p1 -b .1169233
 %endif
 
 %patch500 -p1
@@ -810,6 +812,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri May 29 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-5
+- Added patch for mozbz#1169233 - Disabled menu items
+  are not greyed out
+
 * Fri May 29 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-4
 - Added patch for mozbz#1160154 - huge bookmark padding
 
diff --git a/mozilla-1169233.patch b/mozilla-1169233.patch
new file mode 100644
index 0000000..103a614
--- /dev/null
+++ b/mozilla-1169233.patch
@@ -0,0 +1,71 @@
+# HG changeset patch
+# User Martin Stransky <stransky@redhat.com>
+# Parent  f986e55c4e0b41c6b50bd74d287614b564d7895f
+Bug 1169233 - Get grey (inactive) text color from menu labels, r=?karlt
+
+diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
+--- a/widget/gtk/nsLookAndFeel.cpp
++++ b/widget/gtk/nsLookAndFeel.cpp
+@@ -237,20 +237,18 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+     case eColorID_inactiveborder:
+         // inactive window border
+         gtk_style_context_get_border_color(mBackgroundStyle, 
+                                            GTK_STATE_FLAG_INSENSITIVE, 
+                                            &gdk_color);
+         aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+         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);
++    case eColorID_inactivecaptiontext: // text in inactive window caption
++        aColor = sMenuTextInactive;
+         break;
+     case eColorID_inactivecaption:
+         // inactive window caption
+         gtk_style_context_get_background_color(mBackgroundStyle, 
+                                                GTK_STATE_FLAG_INSENSITIVE, 
+                                                &gdk_color);
+         aColor = GDK_RGBA_TO_NS_RGBA(gdk_color);
+         break;
+@@ -1023,16 +1021,18 @@ nsLookAndFeel::Init()
+     g_object_ref_sink(menu);
+ 
+     gtk_container_add(GTK_CONTAINER(menuitem), accel_label);
+     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+ 
+     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);
+     sMenuBackground = GDK_RGBA_TO_NS_RGBA(color);
+ 
+     style = gtk_widget_get_style_context(menuitem);
+     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
+     sMenuHover = GDK_RGBA_TO_NS_RGBA(color);
+diff --git a/widget/gtk/nsLookAndFeel.h b/widget/gtk/nsLookAndFeel.h
+--- a/widget/gtk/nsLookAndFeel.h
++++ b/widget/gtk/nsLookAndFeel.h
+@@ -54,16 +54,17 @@ protected:
+ 
+     // Cached colors
+     nscolor sInfoBackground;
+     nscolor sInfoText;
+     nscolor sMenuBackground;
+     nscolor sMenuBarText;
+     nscolor sMenuBarHoverText;
+     nscolor sMenuText;
++    nscolor sMenuTextInactive;
+     nscolor sMenuHover;
+     nscolor sMenuHoverText;
+     nscolor sButtonText;
+     nscolor sButtonHoverText;
+     nscolor sButtonBackground;
+     nscolor sFrameOuterLightBorder;
+     nscolor sFrameInnerDarkBorder;
+     nscolor sOddCellBackground;