Changeset 263652 in webkit

Timestamp:

Jun 29, 2020 3:19:10 AM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Dark mode for GTK themes that end with -Dark
​https://bugs.webkit.org/show_bug.cgi?id=213465

Patch by Elliot <​CheeseEBoi@mailo.com> on 2020-06-29
Reviewed by Carlos Garcia Campos.

WebKitGtk has support for automatic detection of dark mode when it comes to GTK themes with the "-dark" and
":dark" suffixes. However, when using GTK themes that end with "-Dark" or ":Dark", this is not the case. This
affects many themes like "Arc" and "Flat-Remix".

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::effectiveAppearanceIsDark const):
(WebKit::PageClientImpl::themeName const):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-29  Elliot  <CheeseEBoi@mailo.com>
+
+        [GTK] Dark mode for GTK themes that end with -Dark
+        https://bugs.webkit.org/show_bug.cgi?id=213465
+
+        Reviewed by Carlos Garcia Campos.
+
+        WebKitGtk has support for automatic detection of dark mode when it comes to GTK themes with the "-dark" and
+        ":dark" suffixes. However, when using GTK themes that end with "-Dark" or ":Dark", this is not the case. This
+        affects many themes like "Arc" and "Flat-Remix".
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::effectiveAppearanceIsDark const):
+        (WebKit::PageClientImpl::themeName const):
+
 2020-06-29  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/PageClientImpl.cpp

@@ -591 +591 @@
 
     if (auto* themeNameEnv = g_getenv("GTK_THEME"))
-        return g_str_has_suffix(themeNameEnv, "-dark") || g_str_has_suffix(themeNameEnv, ":dark");
+        return g_str_has_suffix(themeNameEnv, "-dark") || 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"))
+    if (g_str_has_suffix(themeName.get(), "-dark") || (g_str_has_suffix(themeName.get(), "-Dark")))
         return true;
 
@@ -618 +618 @@
     if (auto* themeNameEnv = g_getenv("GTK_THEME")) {
         String name = String::fromUTF8(themeNameEnv);
-        if (name.endsWith("-dark") || name.endsWith(":dark"))
+        if (name.endsWith("-dark") || name.endsWith("-Dark") || name.endsWith(":dark"))
             return name.substring(0, name.length() - 5);
         return name;
@@ -626 +626 @@
     g_object_get(gtk_widget_get_settings(m_viewWidget), "gtk-theme-name", &themeNameSetting.outPtr(), nullptr);
     String name = String::fromUTF8(themeNameSetting.get());
-    if (name.endsWith("-dark"))
+    if (name.endsWith("-dark") || name.endsWith("-Dark"))
         return name.substring(0, name.length() - 5);
     return name;