<!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>[173640] trunk/Source/WebInspectorUI</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/173640">173640</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-15 17:41:36 -0700 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: mouse drifts away from resizer when resizing docked inspector
https://bugs.webkit.org/show_bug.cgi?id=22263
Patch by Matt Baker <mattbaker@apple.com> on 2014-09-15
Reviewed by Joseph Pecoraro.
Modified the docked resizer dragging logic to record the initial mouse down position relative to the
resizer client rectangle. Added check while dragging the resizer to ensure that the cursor is positioned
correctly with respect to the resize direction before updating the attached window dimension.
* UserInterface/Base/Main.js:
(WebInspector._dockedResizerMouseDown.dockedResizerDrag):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (173639 => 173640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-09-15 23:47:31 UTC (rev 173639)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-09-16 00:41:36 UTC (rev 173640)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-09-15 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: mouse drifts away from resizer when resizing docked inspector
+ https://bugs.webkit.org/show_bug.cgi?id=22263
+
+ Reviewed by Joseph Pecoraro.
+
+ Modified the docked resizer dragging logic to record the initial mouse down position relative to the
+ resizer client rectangle. Added check while dragging the resizer to ensure that the cursor is positioned
+ correctly with respect to the resize direction before updating the attached window dimension.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector._dockedResizerMouseDown.dockedResizerDrag):
+
</ins><span class="cx"> 2014-09-11 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Fix assert in QuickConsole - main frame execution context path component
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (173639 => 173640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-09-15 23:47:31 UTC (rev 173639)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-09-16 00:41:36 UTC (rev 173640)
</span><span class="lines">@@ -1281,25 +1281,40 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var windowProperty = this._dockSide === "bottom" ? "innerHeight" : "innerWidth";
</span><del>- var eventProperty = this._dockSide === "bottom" ? "screenY" : "screenX";
</del><ins>+ var eventScreenProperty = this._dockSide === "bottom" ? "screenY" : "screenX";
+ var eventClientProperty = this._dockSide === "bottom" ? "clientY" : "clientX";
</ins><span class="cx">
</span><span class="cx"> var resizerElement = event.target;
</span><del>- var lastScreenPosition = event[eventProperty];
</del><ins>+ var firstClientPosition = event[eventClientProperty];
+ var lastScreenPosition = event[eventScreenProperty];
</ins><span class="cx">
</span><span class="cx"> function dockedResizerDrag(event)
</span><span class="cx"> {
</span><span class="cx"> if (event.button !== 0)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var position = event[eventProperty];
- var dimension = window[windowProperty] - (position - lastScreenPosition);
</del><ins>+ var position = event[eventScreenProperty];
+ var delta = position - lastScreenPosition;
+ var clientPosition = event[eventClientProperty];
</ins><span class="cx">
</span><ins>+ lastScreenPosition = position;
+
+ // If delta is positive the docked Inspector size is decreasing, in which case the cursor client position
+ // with respect to the target cannot be less than the first mouse down position within the target.
+ if (delta > 0 && clientPosition < firstClientPosition)
+ return;
+
+ // If delta is negative the docked Inspector size is increasing, in which case the cursor client position
+ // with respect to the target cannot be greater than the first mouse down position within the target.
+ if (delta < 0 && clientPosition > firstClientPosition)
+ return;
+
+ var dimension = Math.max(0, window[windowProperty] - delta);
+
</ins><span class="cx"> if (this._dockSide === "bottom")
</span><span class="cx"> InspectorFrontendHost.setAttachedWindowHeight(dimension);
</span><span class="cx"> else
</span><span class="cx"> InspectorFrontendHost.setAttachedWindowWidth(dimension);
</span><del>-
- lastScreenPosition = position;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function dockedResizerDragEnd(event)
</span></span></pre>
</div>
</div>
</body>
</html>