<!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>[20728] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20728">20728</a></dd>
<dt>Author</dt> <dd>adele</dd>
<dt>Date</dt> <dd>2007-04-05 13:30:52 -0700 (Thu, 05 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Hyatt.
Fix for <rdar://problem/5021500> Cursor should stay as pointer when slider is being dragged
Don't set the selection ibeam cursor when there's a node that's capturing mouse events.
* page/EventHandler.cpp:
(WebCore::selectCursor):
(WebCore::EventHandler::handleMouseMoveEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20727 => 20728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-04-05 19:55:36 UTC (rev 20727)
+++ trunk/WebCore/ChangeLog 2007-04-05 20:30:52 UTC (rev 20728)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2007-04-05 Adele Peterson <adele@apple.com>
+
+ Reviewed by Hyatt.
+
+ Fix for <rdar://problem/5021500> Cursor should stay as pointer when slider is being dragged
+
+ Don't set the selection ibeam cursor when there's a node that's capturing mouse events.
+
+ * page/EventHandler.cpp:
+ (WebCore::selectCursor):
+ (WebCore::EventHandler::handleMouseMoveEvent):
+
</ins><span class="cx"> 2007-04-05 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Beth Dakin.
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (20727 => 20728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp 2007-04-05 19:55:36 UTC (rev 20727)
+++ trunk/WebCore/page/EventHandler.cpp 2007-04-05 20:30:52 UTC (rev 20728)
</span><span class="lines">@@ -620,10 +620,12 @@
</span><span class="cx"> return frame->selectionController()->rootEditableElement() != node->rootEditableElement();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* frame, bool mousePressed, PlatformScrollbar* scrollbar)
</del><ins>+// FIXME: We should consider making this a member function now that we're passing in more info about the object.
+static Cursor selectCursor(const MouseEventWithHitTestResults& event, Frame* frame, bool mousePressed, PlatformScrollbar* scrollbar, bool capturingMouseEvents)
</ins><span class="cx"> {
</span><span class="cx"> // During selection, use an I-beam no matter what we're over.
</span><del>- if (mousePressed && frame->selectionController()->isCaretOrRange())
</del><ins>+ // If you're capturing mouse events for a particular node, don't treat this as a selection.
+ if (mousePressed && frame->selectionController()->isCaretOrRange() && !capturingMouseEvents)
</ins><span class="cx"> return iBeamCursor();
</span><span class="cx">
</span><span class="cx"> Node* node = event.targetNode();
</span><span class="lines">@@ -921,7 +923,7 @@
</span><span class="cx"> if (scrollbar && !m_mousePressed)
</span><span class="cx"> scrollbar->handleMouseMoveEvent(mouseEvent); // Handle hover effects on platforms that support visual feedback on scrollbar hovering.
</span><span class="cx"> if ((!m_resizeLayer || !m_resizeLayer->inResizeMode()) && m_frame->view())
</span><del>- m_frame->view()->setCursor(selectCursor(mev, m_frame, m_mousePressed, scrollbar));
</del><ins>+ m_frame->view()->setCursor(selectCursor(mev, m_frame, m_mousePressed, scrollbar, m_capturingMouseEventsNode));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_lastMouseMoveEventSubframe = newSubframe;
</span></span></pre>
</div>
</div>
</body>
</html>