Changeset 262415 in webkit

Timestamp:

Jun 2, 2020, 6:06:35 AM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK4] Implement data list drop down menu
​https://bugs.webkit.org/show_bug.cgi?id=212333

Reviewed by Adrian Perez de Castro.

Use a GtkPopover for GTK4 instead of a GtkMenu.

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::createDataListSuggestionsDropdown):

• UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:

(WebKit::WebDataListSuggestionsDropdownGtk::WebDataListSuggestionsDropdownGtk):
(WebKit::WebDataListSuggestionsDropdownGtk::~WebDataListSuggestionsDropdownGtk):
(WebKit::WebDataListSuggestionsDropdownGtk::show):

• UIProcess/gtk/WebDataListSuggestionsDropdownGtk.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp (modified) (8 diffs)
• UIProcess/gtk/WebDataListSuggestionsDropdownGtk.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-06-02  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK4] Implement data list drop down menu
+        https://bugs.webkit.org/show_bug.cgi?id=212333
+
+        Reviewed by Adrian Perez de Castro.
+
+        Use a GtkPopover for GTK4 instead of a GtkMenu.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::createDataListSuggestionsDropdown):
+        * UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp:
+        (WebKit::WebDataListSuggestionsDropdownGtk::WebDataListSuggestionsDropdownGtk):
+        (WebKit::WebDataListSuggestionsDropdownGtk::~WebDataListSuggestionsDropdownGtk):
+        (WebKit::WebDataListSuggestionsDropdownGtk::show):
+        * UIProcess/gtk/WebDataListSuggestionsDropdownGtk.h:
+
 2020-06-02  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -274 +274 @@
 RefPtr<WebDataListSuggestionsDropdown> PageClientImpl::createDataListSuggestionsDropdown(WebPageProxy& page)
 {
-#if USE(GTK4)
-    return nullptr;
-#else
     return WebDataListSuggestionsDropdownGtk::create(m_viewWidget, page);
-#endif
 }
 #endif

trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.cpp

@@ -27 +27 @@
 #include "WebDataListSuggestionsDropdownGtk.h"
 
-#if ENABLE(DATALIST_ELEMENT) && !USE(GTK4)
+#if ENABLE(DATALIST_ELEMENT)
 
 #include "WebPageProxy.h"
@@ -66 +66 @@
     auto* swindow = gtk_scrolled_window_new(nullptr, nullptr);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swindow), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+#if USE(GTK4)
+    gtk_scrolled_window_set_child(GTK_SCROLLED_WINDOW(swindow), m_treeView);
+#else
     gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swindow), GTK_SHADOW_ETCHED_IN);
     gtk_container_add(GTK_CONTAINER(swindow), m_treeView);
     gtk_widget_show(m_treeView);
-
+#endif
+
+#if USE(GTK4)
+    m_popup = gtk_popover_new();
+    gtk_popover_set_has_arrow(GTK_POPOVER(m_popup), FALSE);
+    gtk_popover_set_autohide(GTK_POPOVER(m_popup), FALSE);
+    gtk_popover_set_position(GTK_POPOVER(m_popup), GTK_POS_BOTTOM);
+    gtk_popover_set_child(GTK_POPOVER(m_popup), swindow);
+    gtk_widget_set_parent(m_popup, m_webView);
+#else
     m_popup = gtk_window_new(GTK_WINDOW_POPUP);
     gtk_window_set_type_hint(GTK_WINDOW(m_popup), GDK_WINDOW_TYPE_HINT_COMBO);
@@ -78 +90 @@
     g_signal_connect_object(m_webView, "focus-out-event", G_CALLBACK(gtk_widget_hide), m_popup, G_CONNECT_SWAPPED);
     g_signal_connect_object(m_webView, "unmap-event", G_CALLBACK(gtk_widget_hide), m_popup, G_CONNECT_SWAPPED);
+#endif
 
 #if ENABLE(DEVELOPER_MODE)
@@ -86 +99 @@
 WebDataListSuggestionsDropdownGtk::~WebDataListSuggestionsDropdownGtk()
 {
+#if !USE(GTK4)
     gtk_window_set_transient_for(GTK_WINDOW(m_popup), nullptr);
     gtk_window_set_attached_to(GTK_WINDOW(m_popup), nullptr);
+#endif
+
 #if ENABLE(DEVELOPER_MODE)
     g_object_set_data(G_OBJECT(m_webView), "wk-datalist-popup", nullptr);
 #endif
+
+#if USE(GTK4)
+    g_clear_pointer(&m_popup, gtk_widget_unparent);
+#else
     gtk_widget_destroy(m_popup);
+#endif
 }
 
@@ -129 +150 @@
     gint itemHeight;
     gtk_tree_view_column_cell_get_size(column, nullptr, nullptr, nullptr, nullptr, &itemHeight);
+#if !USE(GTK4)
     gint verticalSeparator;
     gtk_widget_style_get(m_treeView, "vertical-separator", &verticalSeparator, nullptr);
     itemHeight += verticalSeparator;
+#endif
     if (!itemHeight)
         return;
 
     auto* display = gtk_widget_get_display(m_webView);
+#if USE(GTK4)
+    auto* monitor = gdk_display_get_monitor_at_surface(display, gtk_native_get_surface(gtk_widget_get_native(m_webView)));
+#else
     auto* monitor = gdk_display_get_monitor_at_window(display, gtk_widget_get_window(m_webView));
+#endif
     GdkRectangle area;
     gdk_monitor_get_workarea(monitor, &area);
@@ -142 +169 @@
     size_t itemCount = std::min<size_t>(information.suggestions.size(), (area.height / 3) / itemHeight);
 
+#if USE(GTK4)
+    auto* swindow = GTK_SCROLLED_WINDOW(gtk_popover_get_child(GTK_POPOVER(m_popup)));
+#else
     auto* swindow = GTK_SCROLLED_WINDOW(gtk_bin_get_child(GTK_BIN(m_popup)));
+#endif
     // Disable scrollbars when there's only one item to ensure the scrolled window doesn't take them into account when calculating its minimum size.
     gtk_scrolled_window_set_policy(swindow, GTK_POLICY_NEVER, itemCount > 1 ? GTK_POLICY_AUTOMATIC : GTK_POLICY_NEVER);
@@ -151 +182 @@
     gtk_scrolled_window_set_min_content_height(swindow, itemCount * itemHeight);
 
+#if USE(GTK4)
+    GdkRectangle windowRect(information.elementRect);
+    gtk_popover_set_pointing_to(GTK_POPOVER(m_popup), &windowRect);
+#else
     GtkRequisition menuRequisition;
     gtk_widget_get_preferred_size(m_popup, &menuRequisition, nullptr);
@@ -174 +209 @@
     gtk_window_set_attached_to(GTK_WINDOW(m_popup), m_webView);
     gtk_window_set_screen(GTK_WINDOW(m_popup), gtk_widget_get_screen(m_webView));
+#endif
 
     gtk_widget_show(m_popup);

trunk/Source/WebKit/UIProcess/gtk/WebDataListSuggestionsDropdownGtk.h

@@ -26 +26 @@
 #pragma once
 
-#if ENABLE(DATALIST_ELEMENT) && !USE(GTK4)
+#if ENABLE(DATALIST_ELEMENT)
 
 #include "WebDataListSuggestionsDropdown.h"