Added fix for mozbz#1161056 - combobox background color

2 files changed, 81 insertions, 1 deletions

diff --git a/firefox.spec b/firefox.spec
index 624c1b0..c6b6645 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        38.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -153,6 +153,7 @@ Patch411:        mozilla-1073117-focus.patch
 Patch412:        mozilla-1073117-no-gap-tab.patch
 Patch414:        mozilla-1143686.patch
 Patch415:        mozilla-1144643.patch
+Patch416:        mozilla-1161056.patch
 
 # Fix Skia Neon stuff on AArch64
 Patch500:        aarch64-fix-skia.patch
@@ -305,6 +306,7 @@ cd %{tarballdir}
 %patch412 -p1 -b .1073117-no-gap-tab
 %patch414 -p1 -b .1143686
 %patch415 -p1 -b .1144643
+%patch416 -p1 -b .1161056
 %endif
 
 %patch500 -p1
@@ -802,6 +804,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed May 6 2015 Martin Stransky <stransky@redhat.com> - 38.0-2
+- Added fix for mozbz#1161056 - combobox background color
+
 * Tue May 5 2015 Martin Stransky <stransky@redhat.com> - 38.0-1
 - Update to 38.0 Build 2
 
diff --git a/mozilla-1161056.patch b/mozilla-1161056.patch
new file mode 100644
index 0000000..3730fc5
--- /dev/null
+++ b/mozilla-1161056.patch
@@ -0,0 +1,75 @@
+# HG changeset patch
+# Parent a0787486ecf5950b5753d265a15e0f9a3b4e2ad4
+# User Martin Stransky <stransky@redhat.com>
+Bug 1161056 - Gtk3 - use sMozWindowBackground colors for combobox background. r=karlt
+
+diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
+--- a/widget/gtk/nsLookAndFeel.cpp
++++ b/widget/gtk/nsLookAndFeel.cpp
+@@ -96,16 +96,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+     case eColorID_WidgetBackground:
+     case eColorID_TextBackground:
+     case eColorID_activecaption: // active window caption background
+     case eColorID_appworkspace: // MDI background color
+     case eColorID_background: // desktop background
+     case eColorID_window:
+     case eColorID_windowframe:
+     case eColorID__moz_dialog:
++    case eColorID__moz_combobox:
+         aColor = sMozWindowBackground;
+         break;
+     case eColorID_WindowForeground:
+     case eColorID_WidgetForeground:
+     case eColorID_TextForeground: 
+     case eColorID_captiontext: // text in active window caption, size box, and scrollbar arrow box (!)
+     case eColorID_windowtext:
+     case eColorID__moz_dialogtext:
+@@ -399,19 +400,21 @@ nsLookAndFeel::NativeGetColor(ColorID aI
+         aColor = sOddCellBackground;
+         break;
+     case eColorID__moz_nativehyperlinktext:
+         aColor = sNativeHyperLinkText;
+         break;
+     case eColorID__moz_comboboxtext:
+         aColor = sComboBoxText;
+         break;
++#if (MOZ_WIDGET_GTK == 2)
+     case eColorID__moz_combobox:
+         aColor = sComboBoxBackground;
+         break;
++#endif
+     case eColorID__moz_menubartext:
+         aColor = sMenuBarText;
+         break;
+     case eColorID__moz_menubarhovertext:
+         aColor = sMenuBarHoverText;
+         break;
+     default:
+         /* default color is BLACK */
+@@ -1143,25 +1146,21 @@ nsLookAndFeel::Init()
+ #else
+     // Button text, background, border
+     style = gtk_widget_get_style_context(label);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sButtonText = GDK_RGBA_TO_NS_RGBA(color);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
+     sButtonHoverText = GDK_RGBA_TO_NS_RGBA(color);
+ 
+-    // Combobox label and background colors
++    // Combobox text color
+     style = gtk_widget_get_style_context(comboboxLabel);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sComboBoxText = GDK_RGBA_TO_NS_RGBA(color);
+ 
+-    style = gtk_widget_get_style_context(combobox);
+-    gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
+-    sComboBoxBackground = GDK_RGBA_TO_NS_RGBA(color);
+-
+     // Menubar text and hover text colors    
+     style = gtk_widget_get_style_context(menuBar);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sMenuBarText = GDK_RGBA_TO_NS_RGBA(color);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_PRELIGHT, &color);
+     sMenuBarHoverText = GDK_RGBA_TO_NS_RGBA(color);
+ 
+     // GTK's guide to fancy odd row background colors: