Title: [279823] trunk/Source/WebCore
Revision
279823
Author
commit-qu...@webkit.org
Date
2021-07-12 04:47:43 -0700 (Mon, 12 Jul 2021)

Log Message

[GTK] Adwaita entries should follow the system cursor blink settings
https://bugs.webkit.org/show_bug.cgi?id=227856

Patch by Alexander Mikhaylenko <al...@gnome.org> on 2021-07-12
Reviewed by Adrian Perez de Castro.

Get the caret blink interval from GtkSettings if available, same as it was done
for the GTK theme before.

* rendering/RenderThemeAdwaita.cpp:
(WebCore::RenderThemeAdwaita::caretBlinkInterval const):
* rendering/RenderThemeAdwaita.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (279822 => 279823)


--- trunk/Source/WebCore/ChangeLog	2021-07-12 09:30:56 UTC (rev 279822)
+++ trunk/Source/WebCore/ChangeLog	2021-07-12 11:47:43 UTC (rev 279823)
@@ -1,5 +1,19 @@
 2021-07-12  Alexander Mikhaylenko  <al...@gnome.org>
 
+        [GTK] Adwaita entries should follow the system cursor blink settings
+        https://bugs.webkit.org/show_bug.cgi?id=227856
+
+        Reviewed by Adrian Perez de Castro.
+
+        Get the caret blink interval from GtkSettings if available, same as it was done
+        for the GTK theme before.
+
+        * rendering/RenderThemeAdwaita.cpp:
+        (WebCore::RenderThemeAdwaita::caretBlinkInterval const):
+        * rendering/RenderThemeAdwaita.h:
+
+2021-07-12  Alexander Mikhaylenko  <al...@gnome.org>
+
         [GTK4] Scrollbar click doesn't work as expected when native scrollbars are off
         https://bugs.webkit.org/show_bug.cgi?id=226331
 

Modified: trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp (279822 => 279823)


--- trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp	2021-07-12 09:30:56 UTC (rev 279822)
+++ trunk/Source/WebCore/rendering/RenderThemeAdwaita.cpp	2021-07-12 11:47:43 UTC (rev 279823)
@@ -42,6 +42,10 @@
 #include "UserAgentScripts.h"
 #include "UserAgentStyleSheets.h"
 
+#if PLATFORM(GTK)
+#include <gtk/gtk.h>
+#endif
+
 namespace WebCore {
 
 static const int textFieldBorderSize = 1;
@@ -607,4 +611,14 @@
 }
 #endif // ENABLE(DATALIST_ELEMENT)
 
+#if PLATFORM(GTK)
+Seconds RenderThemeAdwaita::caretBlinkInterval() const
+{
+    gboolean shouldBlink;
+    gint time;
+    g_object_get(gtk_settings_get_default(), "gtk-cursor-blink", &shouldBlink, "gtk-cursor-blink-time", &time, nullptr);
+    return shouldBlink ? 500_us * time : 0_s;
+}
+#endif
+
 } // namespace WebCore

Modified: trunk/Source/WebCore/rendering/RenderThemeAdwaita.h (279822 => 279823)


--- trunk/Source/WebCore/rendering/RenderThemeAdwaita.h	2021-07-12 09:30:56 UTC (rev 279822)
+++ trunk/Source/WebCore/rendering/RenderThemeAdwaita.h	2021-07-12 11:47:43 UTC (rev 279823)
@@ -87,6 +87,10 @@
     int sliderTickOffsetFromTrackCenter() const final;
     void adjustListButtonStyle(RenderStyle&, const Element*) const final;
 #endif
+
+#if PLATFORM(GTK)
+    Seconds caretBlinkInterval() const override;
+#endif
 };
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to