<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[259944] trunk/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/259944">259944</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-12 02:28:45 -0700 (Sun, 12 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Use gdk_window_move_to_rect() to position popup menus
https://bugs.webkit.org/show_bug.cgi?id=210069

Reviewed by Michael Catanzaro.

* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::showPopupMenu):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessgtkWebPopupMenuProxyGtkcpp">trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (259943 => 259944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-04-12 09:27:40 UTC (rev 259943)
+++ trunk/Source/WebKit/ChangeLog       2020-04-12 09:28:45 UTC (rev 259944)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2020-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><ins>+        [GTK] Use gdk_window_move_to_rect() to position popup menus
+        https://bugs.webkit.org/show_bug.cgi?id=210069
+
+        Reviewed by Michael Catanzaro.
+
+        * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+        (WebKit::WebPopupMenuProxyGtk::showPopupMenu):
+
+2020-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
</ins><span class="cx">         [GTK] Page is not drawn with PSON, hardware acceleration and address typed in URL bar
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=208091
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (259943 => 259944)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp       2020-04-12 09:27:40 UTC (rev 259943)
+++ trunk/Source/WebKit/UIProcess/gtk/WebPopupMenuProxyGtk.cpp  2020-04-12 09:28:45 UTC (rev 259944)
</span><span class="lines">@@ -252,6 +252,14 @@
</span><span class="cx">     if (!itemHeight)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    auto* toplevel = gtk_widget_get_toplevel(m_webView);
+    if (GTK_IS_WINDOW(toplevel)) {
+        gtk_window_set_transient_for(GTK_WINDOW(m_popup), GTK_WINDOW(toplevel));
+        gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(toplevel)), GTK_WINDOW(m_popup));
+    }
+    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));
+
</ins><span class="cx">     auto* display = gtk_widget_get_display(m_webView);
</span><span class="cx">     auto* monitor = gdk_display_get_monitor_at_window(display, gtk_widget_get_window(m_webView));
</span><span class="cx">     GdkRectangle area;
</span><span class="lines">@@ -268,12 +276,15 @@
</span><span class="cx">     gtk_widget_set_size_request(m_popup, width, -1);
</span><span class="cx">     gtk_scrolled_window_set_min_content_height(swindow, itemCount * itemHeight);
</span><span class="cx"> 
</span><ins>+    IntPoint menuPosition = convertWidgetPointToScreenPoint(m_webView, rect.location());
+#if GTK_CHECK_VERSION(3, 24, 0)
+    GdkRectangle windowRect = { menuPosition.x(), menuPosition.y(), rect.width(), rect.height() };
+    gdk_window_move_to_rect(gtk_widget_get_window(m_popup), &windowRect, GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_NORTH_WEST,
+        static_cast<GdkAnchorHints>(GDK_ANCHOR_FLIP | GDK_ANCHOR_SLIDE | GDK_ANCHOR_RESIZE), 0, 0);
+#else
</ins><span class="cx">     GtkRequisition menuRequisition;
</span><span class="cx">     gtk_widget_get_preferred_size(m_popup, &menuRequisition, nullptr);
</span><del>-    IntPoint menuPosition = convertWidgetPointToScreenPoint(m_webView, rect.location());
-    // FIXME: We can't ensure the menu will be on screen in Wayland.
-    // https://blog.gtk.org/2016/07/15/future-of-relative-window-positioning/
-    // https://gitlab.gnome.org/GNOME/gtk/issues/997
</del><ins>+
</ins><span class="cx">     if (menuPosition.x() + menuRequisition.width > area.x + area.width)
</span><span class="cx">         menuPosition.setX(area.x + area.width - menuRequisition.width);
</span><span class="cx"> 
</span><span class="lines">@@ -283,15 +294,8 @@
</span><span class="cx">     else
</span><span class="cx">         menuPosition.move(0, -menuRequisition.height);
</span><span class="cx">     gtk_window_move(GTK_WINDOW(m_popup), menuPosition.x(), menuPosition.y());
</span><ins>+#endif
</ins><span class="cx"> 
</span><del>-    auto* toplevel = gtk_widget_get_toplevel(m_webView);
-    if (GTK_IS_WINDOW(toplevel)) {
-        gtk_window_set_transient_for(GTK_WINDOW(m_popup), GTK_WINDOW(toplevel));
-        gtk_window_group_add_window(gtk_window_get_group(GTK_WINDOW(toplevel)), GTK_WINDOW(m_popup));
-    }
-    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));
-
</del><span class="cx">     const GdkEvent* event = m_client->currentlyProcessedMouseDownEvent() ? m_client->currentlyProcessedMouseDownEvent()->nativeEvent() : nullptr;
</span><span class="cx">     m_device = event ? gdk_event_get_device(event) : nullptr;
</span><span class="cx">     if (!m_device)
</span></span></pre>
</div>
</div>

</body>
</html>