Changeset 262137 in webkit

Timestamp:

May 26, 2020 12:59:30 AM (4 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK4] Fix context menu
​https://bugs.webkit.org/show_bug.cgi?id=212344

Reviewed by Adrian Perez de Castro.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseSizeAllocate): Call gtk_native_check_resize() on the popover to make it appear.

• UIProcess/gtk/WebContextMenuProxyGtk.cpp:

(WebKit::destroyMenuWidget): There's no gtk_widget_destroy() in GTK4 so we can just unparent it.
(WebKit::bindModelToMenuWidget): Do not set the action namespace because that's not possible in GTK4.
(WebKit::WebContextMenuProxyGtk::append): Use group.name again for the action name passed to
g_menu_item_set_action_and_target_value().
(WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk): Use destroyMenuWidget().

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)
• UIProcess/gtk/WebContextMenuProxyGtk.cpp (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-26  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK4] Fix context menu
+        https://bugs.webkit.org/show_bug.cgi?id=212344
+
+        Reviewed by Adrian Perez de Castro.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseSizeAllocate): Call gtk_native_check_resize() on the popover to make it appear.
+        * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+        (WebKit::destroyMenuWidget): There's no gtk_widget_destroy() in GTK4 so we can just unparent it.
+        (WebKit::bindModelToMenuWidget): Do not set the action namespace because that's not possible in GTK4.
+        (WebKit::WebContextMenuProxyGtk::append): Use group.name again for the action name passed to
+        g_menu_item_set_action_and_target_value().
+        (WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk): Use destroyMenuWidget().
+
 2020-05-25  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -779 +779 @@
     }
 
+#if USE(GTK4)
+    if (priv->activeContextMenuProxy)
+        gtk_native_check_resize(GTK_NATIVE(priv->activeContextMenuProxy->gtkWidget()));
+#endif
+
     if (auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(priv->pageProxy->drawingArea()))
         drawingArea->setSize(viewRect.size());

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

@@ -80 +80 @@
     gtk_popover_menu_set_menu_model(GTK_POPOVER_MENU(widget), model);
 }
+
+static inline void destroyMenuWidget(GtkWidget* widget)
+{
+    gtk_widget_unparent(widget);
+}
 #else
 const char* WebContextMenuProxyGtk::widgetDismissedSignal = "deactivate";
@@ -122 +127 @@
 static inline void bindModelToMenuWidget(GtkWidget* widget, GMenuModel* model)
 {
-    gtk_menu_shell_bind_model(GTK_MENU_SHELL(widget), model, gContextMenuItemGroup, TRUE);
+    gtk_menu_shell_bind_model(GTK_MENU_SHELL(widget), model, nullptr, TRUE);
+}
+
+static inline void destroyMenuWidget(GtkWidget* widget)
+{
+    gtk_widget_destroy(widget);
 }
 #endif // USE(GTK4)
@@ -152 +162 @@
     case CheckableActionType: {
         gMenuItem = adoptGRef(g_menu_item_new(menuItem.title().utf8().data(), nullptr));
-        g_menu_item_set_action_and_target_value(gMenuItem.get(), g_action_get_name(action), menuItem.gActionTarget());
+        GUniquePtr<char> actionName(g_strdup_printf("%s.%s", gContextMenuItemGroup, g_action_get_name(action)));
+        g_menu_item_set_action_and_target_value(gMenuItem.get(), actionName.get(), menuItem.gActionTarget());
 
         if (menuItem.action() < ContextMenuItemBaseApplicationTag) {
@@ -281 +292 @@
 
     gtk_widget_insert_action_group(GTK_WIDGET(m_menu), gContextMenuItemGroup, nullptr);
-#if !USE(GTK4)
-    gtk_widget_destroy(m_menu);
-#endif
+    destroyMenuWidget(m_menu);
 }