Added tooltip patch (mozbz#1144643)

This commit is contained in:
Martin Stransky 2015-03-27 13:32:33 +01:00
parent 3342822142
commit 528941f0a3
2 changed files with 37 additions and 1 deletions

View File

@ -107,7 +107,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 37.0 Version: 37.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -152,6 +152,7 @@ Patch411: mozilla-1073117-focus.patch
Patch412: mozilla-1073117-no-gap-tab.patch Patch412: mozilla-1073117-no-gap-tab.patch
Patch413: mozilla-975919-gtk3-hidpi.patch Patch413: mozilla-975919-gtk3-hidpi.patch
Patch414: mozilla-1143686.patch Patch414: mozilla-1143686.patch
Patch415: mozilla-1144643.patch
%if %{official_branding} %if %{official_branding}
# Required by Mozilla Corporation # Required by Mozilla Corporation
@ -301,6 +302,7 @@ cd %{tarballdir}
%patch412 -p1 -b .1073117-no-gap-tab %patch412 -p1 -b .1073117-no-gap-tab
%patch413 -p2 -b .975919-gtk3-hidpi %patch413 -p2 -b .975919-gtk3-hidpi
%patch414 -p1 -b .1143686 %patch414 -p1 -b .1143686
%patch415 -p1 -b .1144643
%endif %endif
%if %{official_branding} %if %{official_branding}
@ -796,6 +798,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Fri Mar 27 2015 Martin Stransky <stransky@redhat.com> - 37.0-2
- Added tooltip patch (mozbz#1144643)
* Fri Mar 27 2015 Martin Stransky <stransky@redhat.com> - 37.0-1 * Fri Mar 27 2015 Martin Stransky <stransky@redhat.com> - 37.0-1
- Update to 37.0 Build 2 - Update to 37.0 Build 2

31
mozilla-1144643.patch Normal file
View File

@ -0,0 +1,31 @@
# HG changeset patch
# User Martin Stransky <stransky@redhat.com>
# Parent fe49971df272eeb2333d992dfc7a1928d261f0c9
Bug 1144643 - Render tooltips as transparent on Gtk3, r=?karlt
diff --git a/widget/gtk/nsNativeThemeGTK.cpp b/widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -1523,15 +1523,21 @@ nsNativeThemeGTK::GetWidgetTransparency(
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
case NS_THEME_TOOLBAR:
case NS_THEME_MENUBAR:
#endif
case NS_THEME_MENUPOPUP:
case NS_THEME_WINDOW:
case NS_THEME_DIALOG:
- // Tooltips use gtk_paint_flat_box().
+ return eOpaque;
+ // Tooltips use gtk_paint_flat_box() on Gtk2
+ // but are shaped on Gtk3
case NS_THEME_TOOLTIP:
+#if (MOZ_WIDGET_GTK == 2)
return eOpaque;
+#else
+ return eTransparent;
+#endif
}
return eUnknownTransparency;
}