Title: [255349] releases/WebKitGTK/webkit-2.26/Source/WebKit
- Revision
- 255349
- Author
- carlo...@webkit.org
- Date
- 2020-01-29 02:38:26 -0800 (Wed, 29 Jan 2020)
Log Message
[GTK] Fix logic of dark theme detection
https://bugs.webkit.org/show_bug.cgi?id=202276
- If GTK_THEME is set it has a higher priority to GtkSettings.
- GTK_THEME may be a -dark theme or :dark variant, handle both.
Reviewed by Michael Catanzaro.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::effectiveAppearanceIsDark const):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog (255348 => 255349)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2020-01-29 10:38:04 UTC (rev 255348)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog 2020-01-29 10:38:26 UTC (rev 255349)
@@ -1,3 +1,16 @@
+2019-09-26 Patrick Griffis <pgrif...@igalia.com>
+
+ [GTK] Fix logic of dark theme detection
+ https://bugs.webkit.org/show_bug.cgi?id=202276
+
+ - If GTK_THEME is set it has a higher priority to GtkSettings.
+ - GTK_THEME may be a -dark theme or :dark variant, handle both.
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::effectiveAppearanceIsDark const):
+
2020-01-28 Carlos Garcia Campos <cgar...@igalia.com>
[GTK][WPE] QR code not loaded in web.whatsapp.com
Modified: releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp (255348 => 255349)
--- releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2020-01-29 10:38:04 UTC (rev 255348)
+++ releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp 2020-01-29 10:38:26 UTC (rev 255349)
@@ -561,14 +561,14 @@
if (preferDarkTheme)
return true;
+ if (auto* themeNameEnv = g_getenv("GTK_THEME"))
+ return g_str_has_suffix(themeNameEnv, "-dark") || g_str_has_suffix(themeNameEnv, ":dark");
+
GUniqueOutPtr<char> themeName;
g_object_get(settings, "gtk-theme-name", &themeName.outPtr(), nullptr);
if (g_str_has_suffix(themeName.get(), "-dark"))
return true;
- if (auto* themeNameEnv = g_getenv("GTK_THEME"))
- return g_str_has_suffix(themeNameEnv, ":dark");
-
return false;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
