Disable dark theme until we support it correctly (mozbz#1216658)
This commit is contained in:
parent
b7dea905ea
commit
4d24fce2a5
@ -92,7 +92,7 @@
|
|||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 46.0.1
|
Version: 46.0.1
|
||||||
Release: 1%{?pre_tag}%{?dist}
|
Release: 2%{?pre_tag}%{?dist}
|
||||||
URL: https://www.mozilla.org/firefox/
|
URL: https://www.mozilla.org/firefox/
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
@ -136,6 +136,7 @@ Patch305: mozilla-1245076.patch
|
|||||||
Patch306: mozilla-1245076-1.patch
|
Patch306: mozilla-1245076-1.patch
|
||||||
Patch400: mozilla-1255590.patch
|
Patch400: mozilla-1255590.patch
|
||||||
Patch402: mozilla-1196777.patch
|
Patch402: mozilla-1196777.patch
|
||||||
|
Patch403: mozilla-1216658.patch
|
||||||
|
|
||||||
# Debian patches
|
# Debian patches
|
||||||
Patch500: mozilla-440908.patch
|
Patch500: mozilla-440908.patch
|
||||||
@ -280,6 +281,7 @@ cd %{tarballdir}
|
|||||||
%patch306 -p1 -b .1245076-1
|
%patch306 -p1 -b .1245076-1
|
||||||
%patch400 -p1 -b .1255590
|
%patch400 -p1 -b .1255590
|
||||||
%patch402 -p1 -b .1196777
|
%patch402 -p1 -b .1196777
|
||||||
|
%patch403 -p1 -b .1216658
|
||||||
|
|
||||||
# Debian extension patch
|
# Debian extension patch
|
||||||
%patch500 -p1 -b .440908
|
%patch500 -p1 -b .440908
|
||||||
@ -799,6 +801,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 5 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-2
|
||||||
|
- Disable dark theme until we support it correctly (mozbz#1216658)
|
||||||
|
|
||||||
* Tue May 3 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-1
|
* Tue May 3 2016 Martin Stransky <stransky@redhat.com> - 46.0.1-1
|
||||||
- Updated to 46.0.1
|
- Updated to 46.0.1
|
||||||
|
|
||||||
|
30
mozilla-1216658.patch
Normal file
30
mozilla-1216658.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
# HG changeset patch
|
||||||
|
# User Nicolas Silva <nsilva@mozilla.com>
|
||||||
|
# Parent 0711218a018d912036f7d3be2ae2649e213cfb85
|
||||||
|
Bug 1216658 - Ignore Gt3 dark themes and use light theme's color scheme for native widgets. r=karlt
|
||||||
|
|
||||||
|
diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
|
||||||
|
--- a/widget/gtk/nsLookAndFeel.cpp
|
||||||
|
+++ b/widget/gtk/nsLookAndFeel.cpp
|
||||||
|
@@ -966,16 +966,21 @@ nsLookAndFeel::Init()
|
||||||
|
sMenuHoverText = GDK_COLOR_TO_NS_RGB(style->fg[GTK_STATE_PRELIGHT]);
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_unref(menu);
|
||||||
|
#else
|
||||||
|
GdkRGBA color;
|
||||||
|
GtkStyleContext *style;
|
||||||
|
|
||||||
|
+ // Disable dark theme because it interracts poorly with wdget styling in
|
||||||
|
+ // web content.
|
||||||
|
+ g_object_set(gtk_settings_get_default (),
|
||||||
|
+ "gtk-application-prefer-dark-theme", FALSE, NULL);
|
||||||
|
+
|
||||||
|
// Gtk manages a screen's CSS in the settings object so we
|
||||||
|
// ask Gtk to create it explicitly. Otherwise we may end up
|
||||||
|
// with wrong color theme, see Bug 972382
|
||||||
|
(void)gtk_settings_get_for_screen(gdk_screen_get_default());
|
||||||
|
|
||||||
|
GtkWidgetPath *path = gtk_widget_path_new();
|
||||||
|
gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user