<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[20006] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20006">20006</a></dd>
<dt>Author</dt> <dd>mjs</dd>
<dt>Date</dt> <dd>2007-03-06 21:36:21 -0800 (Tue, 06 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Adele.
<rdar://problem/4619663> REGRESSION (NativePopup): Popup menu doesn't draw at the correct vertical position (9816)
* platform/mac/PopupMenuMac.mm:
(WebCore::PopupMenu::show): Make a temporary dummy view with the
passed in rect, since AppKit will use the view bounds to determine
what area to exclude when popping up a menu moved to the top of
the screen.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreplatformmacPopupMenuMacmm">trunk/WebCore/platform/mac/PopupMenuMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20005 => 20006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-03-07 05:25:14 UTC (rev 20005)
+++ trunk/WebCore/ChangeLog 2007-03-07 05:36:21 UTC (rev 20006)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-03-06 Maciej Stachowiak <mjs@apple.com>
+
+ Reviewed by Adele.
+
+ <rdar://problem/4619663> REGRESSION (NativePopup): Popup menu doesn't draw at the correct vertical position (9816)
+
+ * platform/mac/PopupMenuMac.mm:
+ (WebCore::PopupMenu::show): Make a temporary dummy view with the
+ passed in rect, since AppKit will use the view bounds to determine
+ what area to exclude when popping up a menu moved to the top of
+ the screen.
+
</ins><span class="cx"> 2007-03-06 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Maciej Stachowiak.
</span></span></pre></div>
<a id="trunkWebCoreplatformmacPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/mac/PopupMenuMac.mm (20005 => 20006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/mac/PopupMenuMac.mm 2007-03-07 05:25:14 UTC (rev 20005)
+++ trunk/WebCore/platform/mac/PopupMenuMac.mm 2007-03-07 05:36:21 UTC (rev 20006)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> NSPoint location;
</span><span class="cx"> NSFont* font = client()->clientStyle()->font().primaryFont()->getNSFont();
</span><del>-
</del><ins>+
</ins><span class="cx"> // These values were borrowed from AppKit to match their placement of the menu.
</span><span class="cx"> const int popOverHorizontalAdjust = -10;
</span><span class="cx"> const int popUnderHorizontalAdjust = 6;
</span><span class="lines">@@ -142,10 +142,16 @@
</span><span class="cx"> NSEvent* event = [frame->eventHandler()->currentNSEvent() retain];
</span><span class="cx">
</span><span class="cx"> RefPtr<PopupMenu> protector(this);
</span><ins>+
+ RetainPtr<NSView> dummyView(AdoptNS, [[NSView alloc] initWithFrame:r]);
+ [view addSubview:dummyView.get()];
+ location = [dummyView.get() convertPoint:location fromView:view];
</ins><span class="cx">
</span><span class="cx"> frame->willPopupMenu(menu);
</span><del>- wkPopupMenu(menu, location, roundf(NSWidth(r)), view, index, font);
</del><ins>+ wkPopupMenu(menu, location, roundf(NSWidth(r)), dummyView.get(), index, font);
</ins><span class="cx">
</span><ins>+ [dummyView.get() removeFromSuperview];
+
</ins><span class="cx"> if (client()) {
</span><span class="cx"> int newIndex = [m_popup.get() indexOfSelectedItem];
</span><span class="cx"> client()->hidePopup();
</span></span></pre>
</div>
</div>
</body>
</html>