<!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>[159919] releases/WebKitGTK/webkit-2.2/Source/WebCore</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/159919">159919</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 01:24:13 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/159615">r159615</a> - [GTK] Cannot scroll in option menu when it larger than the screen
https://bugs.webkit.org/show_bug.cgi?id=124671
Reviewed by Martin Robinson.
The problem is that the popup menu is not resized to fit in the
screen, so it doesn't scroll and some of the items are offscreen
so they can't be selected either. GTK+ automatically resizes the
popup menus to fit in the work area, but only when the menu is
already positioned.
* platform/gtk/GtkPopupMenu.cpp:
(WebCore::GtkPopupMenu::popUp): Schedule a resize of the popup
menu right after showing it once it has a position.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreplatformgtkGtkPopupMenucpp">releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/GtkPopupMenu.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (159918 => 159919)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-02 09:20:05 UTC (rev 159918)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2013-12-02 09:24:13 UTC (rev 159919)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-11-21 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Cannot scroll in option menu when it larger than the screen
+ https://bugs.webkit.org/show_bug.cgi?id=124671
+
+ Reviewed by Martin Robinson.
+
+ The problem is that the popup menu is not resized to fit in the
+ screen, so it doesn't scroll and some of the items are offscreen
+ so they can't be selected either. GTK+ automatically resizes the
+ popup menus to fit in the work area, but only when the menu is
+ already positioned.
+
+ * platform/gtk/GtkPopupMenu.cpp:
+ (WebCore::GtkPopupMenu::popUp): Schedule a resize of the popup
+ menu right after showing it once it has a position.
+
</ins><span class="cx"> 2013-11-20 Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove Chromium as user agent and claim to be Safari in OS X
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreplatformgtkGtkPopupMenucpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/GtkPopupMenu.cpp (159918 => 159919)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2013-12-02 09:20:05 UTC (rev 159918)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2013-12-02 09:24:13 UTC (rev 159919)
</span><span class="lines">@@ -86,17 +86,17 @@
</span><span class="cx"> #else
</span><span class="cx"> gtk_widget_get_preferred_size(m_popup.get(), &requisition, 0);
</span><span class="cx"> #endif
</span><del>-
</del><span class="cx"> gtk_widget_set_size_request(m_popup.get(), std::max(menuSize.width(), requisition.width), -1);
</span><span class="cx">
</span><del>- GList* children = gtk_container_get_children(GTK_CONTAINER(m_popup.get()));
- GList* p = children;
</del><span class="cx"> if (itemCount) {
</span><del>- for (int i = 0; i < itemCount; i++) {
</del><ins>+ GOwnPtr<GList> children(gtk_container_get_children(GTK_CONTAINER(m_popup.get())));
+ int i;
+ GList* child;
+ for (i = 0, child = children.get(); i < itemCount; i++, child = g_list_next(child)) {
</ins><span class="cx"> if (i > selectedItem)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- GtkWidget* item = reinterpret_cast<GtkWidget*>(p->data);
</del><ins>+ GtkWidget* item = GTK_WIDGET(child->data);
</ins><span class="cx"> GtkRequisition itemRequisition;
</span><span class="cx"> #ifdef GTK_API_VERSION_2
</span><span class="cx"> gtk_widget_get_child_requisition(item, &itemRequisition);
</span><span class="lines">@@ -104,31 +104,23 @@
</span><span class="cx"> gtk_widget_get_preferred_size(item, &itemRequisition, 0);
</span><span class="cx"> #endif
</span><span class="cx"> m_menuPosition.setY(m_menuPosition.y() - itemRequisition.height);
</span><del>-
- p = g_list_next(p);
</del><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Center vertically the empty popup in the combo box area.
</span><span class="cx"> m_menuPosition.setY(m_menuPosition.y() - menuSize.height() / 2);
</span><span class="cx"> }
</span><del>- g_list_free(children);
</del><span class="cx">
</span><del>- guint button;
- guint32 activateTime;
- if (event) {
- button = event->type == GDK_BUTTON_PRESS ? event->button.button : 1;
- activateTime = gdk_event_get_time(event);
- } else {
- button = 1;
- activateTime = GDK_CURRENT_TIME;
- }
-
</del><ins>+ guint button = event && event->type == GDK_BUTTON_PRESS ? event->button.button : 1;
+ guint32 activateTime = event ? gdk_event_get_time(event) : GDK_CURRENT_TIME;
</ins><span class="cx"> #ifdef GTK_API_VERSION_2
</span><span class="cx"> gtk_menu_popup(GTK_MENU(m_popup.get()), 0, 0, reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, button, activateTime);
</span><span class="cx"> #else
</span><span class="cx"> gtk_menu_popup_for_device(GTK_MENU(m_popup.get()), event ? gdk_event_get_device(event) : 0, 0, 0,
</span><del>- reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, 0, button, activateTime);
</del><ins>+ reinterpret_cast<GtkMenuPositionFunc>(menuPositionFunction), this, 0, button, activateTime);
</ins><span class="cx"> #endif
</span><ins>+
+ // Now that the menu has a position, schedule a resize to make sure it's resized to fit vertically in the work area.
+ gtk_widget_queue_resize(m_popup.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GtkPopupMenu::popDown()
</span></span></pre>
</div>
</div>
</body>
</html>