Changeset 255349 in webkit

Timestamp:

Jan 29, 2020, 2:38:26 AM (7 years ago)

Author:

Carlos Garcia Campos

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):

Location:

releases/WebKitGTK/webkit-2.26/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.26/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-26  Patrick Griffis  <pgriffis@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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.26/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp

@@ -562 +562 @@
         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);
@@ -567 +570 @@
         return true;
 
-    if (auto* themeNameEnv = g_getenv("GTK_THEME"))
-        return g_str_has_suffix(themeNameEnv, ":dark");
-
     return false;
 }