<!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>[172617] 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/172617">172617</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-14 17:30:38 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Dragging Undocked inspector by window title has broken behavior
https://bugs.webkit.org/show_bug.cgi?id=135950
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-08-14
Reviewed by Timothy Hatcher.
* UserInterface/Base/Main.js:
On Mac ports where we the inspector content goes everywhere, window dragging behavior
still exists for the top 22px of the window. So don't do our JavaScript based window
dragging for this special region.
* UserInterface/Models/KeyboardShortcut.js:
(WebInspector.KeyboardShortcut.Modifier.get CommandOrControl):
(WebInspector.KeyboardShortcut.prototype.get displayName):
Instead of calling a host function, use the value already in the frontend.</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>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsKeyboardShortcutjs">trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172616 => 172617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-15 00:21:25 UTC (rev 172616)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-15 00:30:38 UTC (rev 172617)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-08-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Dragging Undocked inspector by window title has broken behavior
+ https://bugs.webkit.org/show_bug.cgi?id=135950
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ On Mac ports where we the inspector content goes everywhere, window dragging behavior
+ still exists for the top 22px of the window. So don't do our JavaScript based window
+ dragging for this special region.
+
+ * UserInterface/Models/KeyboardShortcut.js:
+ (WebInspector.KeyboardShortcut.Modifier.get CommandOrControl):
+ (WebInspector.KeyboardShortcut.prototype.get displayName):
+ Instead of calling a host function, use the value already in the frontend.
+
+2014-08-14 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Split console toggle button wrong - Images/Images/SplitToggleUp.svg does not exist
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135957
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (172616 => 172617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-15 00:21:25 UTC (rev 172616)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-08-15 00:30:38 UTC (rev 172617)
</span><span class="lines">@@ -1316,6 +1316,13 @@
</span><span class="cx"> !event.target.classList.contains("item-section"))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // Ignore dragging on the top of the toolbar on Mac where the inspector content fills the entire window.
+ if (WebInspector.Platform.name === "mac" && WebInspector.Platform.version.release >= 10) {
+ const windowDragHandledTitleBarHeight = 22;
+ if (event.pageY < windowDragHandledTitleBarHeight)
+ return;
+ }
+
</ins><span class="cx"> var lastScreenX = event.screenX;
</span><span class="cx"> var lastScreenY = event.screenY;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsKeyboardShortcutjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js (172616 => 172617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2014-08-15 00:21:25 UTC (rev 172616)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/KeyboardShortcut.js 2014-08-15 00:30:38 UTC (rev 172617)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> get CommandOrControl()
</span><span class="cx"> {
</span><del>- return InspectorFrontendHost.platform() === "mac" ? this.Command : this.Control;
</del><ins>+ return WebInspector.Platform.name === "mac" ? this.Command : this.Control;
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Control)
</span><span class="cx"> result += "\u2303";
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Option)
</span><del>- result += InspectorFrontendHost.platform() === "mac" ? "\u2325" : "\u2387";
</del><ins>+ result += WebInspector.Platform.name === "mac" ? "\u2325" : "\u2387";
</ins><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Shift)
</span><span class="cx"> result += "\u21e7";
</span><span class="cx"> if (this._modifiers & WebInspector.KeyboardShortcut.Modifier.Command)
</span></span></pre>
</div>
</div>
</body>
</html>