summaryrefslogtreecommitdiff
path: root/mozilla-1272332.patch
diff options
context:
space:
mode:
authorMartin Stransky <stransky@redhat.com>2016-07-28 09:42:48 +0200
committerMartin Stransky <stransky@redhat.com>2016-07-28 09:42:48 +0200
commit240bc4c032856d376f2c611dcc32ef8a7ed876a6 (patch)
treec1653d285fcf2aeeb4b7b3d48198833fa71b48fc /mozilla-1272332.patch
parentMerge branch 'master' into f24 (diff)
parentEnable dark themes by pref in about:config (Bug 1272332) (diff)
downloadlibrewolf-fedora-ff-240bc4c032856d376f2c611dcc32ef8a7ed876a6.tar.gz
librewolf-fedora-ff-240bc4c032856d376f2c611dcc32ef8a7ed876a6.tar.bz2
librewolf-fedora-ff-240bc4c032856d376f2c611dcc32ef8a7ed876a6.zip
Merge branch 'master' into f24
Diffstat (limited to 'mozilla-1272332.patch')
-rw-r--r--mozilla-1272332.patch71
1 files changed, 71 insertions, 0 deletions
diff --git a/mozilla-1272332.patch b/mozilla-1272332.patch
new file mode 100644
index 0000000..3d7b10e
--- /dev/null
+++ b/mozilla-1272332.patch
@@ -0,0 +1,71 @@
+# HG changeset patch
+# User Nicolas Silva <nsilva@mozilla.com>
+# Parent 14c5bf11d37b9e92d27f7089d9392de2ac339bb3
+Bug 1272332 - Allow gtk the global dark theme behind a pref. r=karlt
+
+diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -4560,16 +4560,17 @@ pref("gfx.content.use-native-pushlayer",
+ #ifdef ANDROID
+ pref("gfx.apitrace.enabled",false);
+ #endif
+
+ #ifdef MOZ_X11
+ pref("gfx.content.use-native-pushlayer", true);
+ #ifdef MOZ_WIDGET_GTK
+ pref("gfx.xrender.enabled",false);
++pref("widget.allow-gtk-dark-theme", false);
+ #endif
+ #endif
+
+ #ifdef XP_WIN
+ pref("gfx.content.use-native-pushlayer", true);
+
+ // Whether to disable the automatic detection and use of direct2d.
+ pref("gfx.direct2d.disabled", false);
+diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
+--- a/widget/gtk/nsLookAndFeel.cpp
++++ b/widget/gtk/nsLookAndFeel.cpp
+@@ -1093,26 +1093,32 @@ nsLookAndFeel::Init()
+ GdkRGBA color;
+ GtkStyleContext *style;
+
+ // 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
+ GtkSettings *settings = gtk_settings_get_for_screen(gdk_screen_get_default());
+
+- // Disable dark theme because it interacts poorly with widget styling in
+- // web content (see bug 1216658).
+- // To avoid triggering reload of theme settings unnecessarily, only set the
+- // setting when necessary.
+- const gchar* dark_setting = "gtk-application-prefer-dark-theme";
+- gboolean dark;
+- g_object_get(settings, dark_setting, &dark, nullptr);
+
+- if (dark) {
+- g_object_set(settings, dark_setting, FALSE, nullptr);
++ bool isContentProcess = XRE_IsContentProcess();
++ bool allowDarkTheme = mozilla::Preferences::GetBool("widget.allow-gtk-dark-theme", false);
++
++ if (isContentProcess || !allowDarkTheme) {
++ // Disable dark theme because it interacts poorly with widget styling in
++ // web content (see bug 1216658).
++ // To avoid triggering reload of theme settings unnecessarily, only set the
++ // setting when necessary.
++ const gchar* dark_setting = "gtk-application-prefer-dark-theme";
++ gboolean dark;
++ g_object_get(settings, dark_setting, &dark, nullptr);
++
++ if (dark) {
++ g_object_set(settings, dark_setting, FALSE, nullptr);
++ }
+ }
+
+ GtkWidgetPath *path = gtk_widget_path_new();
+ gtk_widget_path_append_type(path, GTK_TYPE_WINDOW);
+
+ mBackgroundStyle = create_context(path);
+ gtk_style_context_add_class(mBackgroundStyle, GTK_STYLE_CLASS_BACKGROUND);
+
bgstack15