<!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>[186301] 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/186301">186301</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-07-05 23:20:27 -0700 (Sun, 05 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Timeline row selection should have same background color in sidebar and data grid
https://bugs.webkit.org/show_bug.cgi?id=146606
Support a force-focus class name that TreeOutlineDataGridSynchronizer applies when one of the
elements is focused, so the other can look focused too.
Reviewed by Joseph Pecoraro.
* UserInterface/Views/DataGrid.css:
(.data-grid:matches(:focus, .force-focus) tr.selected td:not(:last-child)):
(.data-grid:matches(:focus, .force-focus) tr.parent.selected td.disclosure::before):
(.data-grid:matches(:focus, .force-focus) tr.parent.expanded.selected td.disclosure::before):
(.data-grid:matches(:focus, .force-focus) tr.selected):
(.data-grid:matches(:focus, .force-focus) tr.selected td .subtitle):
* UserInterface/Views/Main.css:
(:matches(:focus, .force-focus) .selected .go-to-arrow):
(:matches(:focus, .force-focus) .selected .go-to-arrow:active):
* UserInterface/Views/NavigationSidebarPanel.css:
(.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .disclosure-button):
(.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected.expanded .disclosure-button):
(.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected):
(.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .subtitle):
* UserInterface/Views/TreeElementStatusButton.css:
(:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .filled):
(:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .stroked):
* UserInterface/Views/TreeOutlineDataGridSynchronizer.js:
(WebInspector.TreeOutlineDataGridSynchronizer):
(WebInspector.TreeOutlineDataGridSynchronizer.prototype._dataGridGainedFocus): Added.
(WebInspector.TreeOutlineDataGridSynchronizer.prototype._dataGridLostFocus): Added.
(WebInspector.TreeOutlineDataGridSynchronizer.prototype._treeOutlineGainedFocus): Added.
(WebInspector.TreeOutlineDataGridSynchronizer.prototype._treeOutlineLostFocus): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsMaincss">trunk/Source/WebInspectorUI/UserInterface/Views/Main.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeElementStatusButtoncss">trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs">trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-07-05 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Timeline row selection should have same background color in sidebar and data grid
+ https://bugs.webkit.org/show_bug.cgi?id=146606
+
+ Support a force-focus class name that TreeOutlineDataGridSynchronizer applies when one of the
+ elements is focused, so the other can look focused too.
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid:matches(:focus, .force-focus) tr.selected td:not(:last-child)):
+ (.data-grid:matches(:focus, .force-focus) tr.parent.selected td.disclosure::before):
+ (.data-grid:matches(:focus, .force-focus) tr.parent.expanded.selected td.disclosure::before):
+ (.data-grid:matches(:focus, .force-focus) tr.selected):
+ (.data-grid:matches(:focus, .force-focus) tr.selected td .subtitle):
+
+ * UserInterface/Views/Main.css:
+ (:matches(:focus, .force-focus) .selected .go-to-arrow):
+ (:matches(:focus, .force-focus) .selected .go-to-arrow:active):
+
+ * UserInterface/Views/NavigationSidebarPanel.css:
+ (.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .disclosure-button):
+ (.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected.expanded .disclosure-button):
+ (.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected):
+ (.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .subtitle):
+
+ * UserInterface/Views/TreeElementStatusButton.css:
+ (:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .filled):
+ (:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .stroked):
+
+ * UserInterface/Views/TreeOutlineDataGridSynchronizer.js:
+ (WebInspector.TreeOutlineDataGridSynchronizer):
+ (WebInspector.TreeOutlineDataGridSynchronizer.prototype._dataGridGainedFocus): Added.
+ (WebInspector.TreeOutlineDataGridSynchronizer.prototype._dataGridLostFocus): Added.
+ (WebInspector.TreeOutlineDataGridSynchronizer.prototype._treeOutlineGainedFocus): Added.
+ (WebInspector.TreeOutlineDataGridSynchronizer.prototype._treeOutlineLostFocus): Added.
+
</ins><span class="cx"> 2015-07-05 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Deleting in the CSS sidebar causes the warning icon to appear mid-word
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid:focus tr.selected td:not(:last-child) {
</del><ins>+.data-grid:matches(:focus, .force-focus) tr.selected td:not(:last-child) {
</ins><span class="cx"> border-right-color: rgb(0, 102, 204);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -230,11 +230,11 @@
</span><span class="cx"> background-image: -webkit-canvas(disclosure-triangle-tiny-open-normal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid:focus tr.parent.selected td.disclosure::before {
</del><ins>+.data-grid:matches(:focus, .force-focus) tr.parent.selected td.disclosure::before {
</ins><span class="cx"> background-image: -webkit-canvas(disclosure-triangle-tiny-closed-selected);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid:focus tr.parent.expanded.selected td.disclosure::before {
</del><ins>+.data-grid:matches(:focus, .force-focus) tr.parent.expanded.selected td.disclosure::before {
</ins><span class="cx"> background-image: -webkit-canvas(disclosure-triangle-tiny-open-selected);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> color: inherit !important;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid:focus tr.selected {
</del><ins>+.data-grid:matches(:focus, .force-focus) tr.selected {
</ins><span class="cx"> background-color: rgb(0, 128, 252) !important;
</span><span class="cx"> color: white !important;
</span><span class="cx"> }
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> content: " — ";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid:focus tr.selected td .subtitle {
</del><ins>+.data-grid:matches(:focus, .force-focus) tr.selected td .subtitle {
</ins><span class="cx"> color: rgba(255, 255, 255, 0.9);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsMaincss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Main.css (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Main.css 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -261,11 +261,11 @@
</span><span class="cx"> background-image: -webkit-canvas(go-to-arrow-normal-active);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:focus .selected .go-to-arrow {
</del><ins>+:matches(:focus, .force-focus) .selected .go-to-arrow {
</ins><span class="cx"> background-image: -webkit-canvas(go-to-arrow-selected);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:focus .selected .go-to-arrow:active {
</del><ins>+:matches(:focus, .force-focus) .selected .go-to-arrow:active {
</ins><span class="cx"> background-image: -webkit-canvas(go-to-arrow-selected-active);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.css 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.navigation-sidebar-panel-content-tree-outline:focus .item.selected .disclosure-button {
</del><ins>+.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .disclosure-button {
</ins><span class="cx"> background-image: -webkit-canvas(navigation-sidebar-panel-disclosure-triangle-closed-selected) !important;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> background-image: -webkit-canvas(navigation-sidebar-panel-disclosure-triangle-open-normal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.navigation-sidebar-panel-content-tree-outline:focus .item.selected.expanded .disclosure-button {
</del><ins>+.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected.expanded .disclosure-button {
</ins><span class="cx"> background-image: -webkit-canvas(navigation-sidebar-panel-disclosure-triangle-open-selected) !important;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> background-color: rgb(212, 212, 212);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.navigation-sidebar-panel-content-tree-outline:focus .item.selected {
</del><ins>+.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected {
</ins><span class="cx"> color: white;
</span><span class="cx"> background-color: rgb(0, 128, 252);
</span><span class="cx"> }
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> color: rgba(0, 0, 0, 0.7);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.navigation-sidebar-panel-content-tree-outline:focus .item.selected .subtitle {
</del><ins>+.navigation-sidebar-panel-content-tree-outline:matches(:focus, .force-focus) .item.selected .subtitle {
</ins><span class="cx"> color: rgba(255, 255, 255, 0.9);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeElementStatusButtoncss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeElementStatusButton.css 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> fill: rgb(128, 128, 128);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:focus .item.selected > .status > .status-button > svg .filled {
</del><ins>+:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .filled {
</ins><span class="cx"> fill: white !important;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> stroke: rgb(128, 128, 128);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-:focus .item.selected > .status > .status-button > svg .stroked {
</del><ins>+:matches(:focus, .force-focus) .item.selected > .status > .status-button > svg .stroked {
</ins><span class="cx"> stroke: white !important;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTreeOutlineDataGridSynchronizerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js (186300 => 186301)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js 2015-07-06 04:36:01 UTC (rev 186300)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutlineDataGridSynchronizer.js 2015-07-06 06:20:27 UTC (rev 186301)
</span><span class="lines">@@ -43,6 +43,12 @@
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.CollapsedNode, this._dataGridNodeCollapsed, this);
</span><span class="cx"> this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><span class="cx">
</span><ins>+ this._dataGrid.element.addEventListener("focus", this._dataGridGainedFocus.bind(this));
+ this._dataGrid.element.addEventListener("blur", this._dataGridLostFocus.bind(this));
+
+ this._treeOutline.element.addEventListener("focus", this._treeOutlineGainedFocus.bind(this));
+ this._treeOutline.element.addEventListener("blur", this._treeOutlineLostFocus.bind(this));
+
</ins><span class="cx"> // FIXME: This is a hack. TreeOutline should just dispatch events via WebInspector.Object.
</span><span class="cx"> var existingOnAdd = treeOutline.onadd;
</span><span class="cx"> var existingOnRemove = treeOutline.onremove;
</span><span class="lines">@@ -169,6 +175,16 @@
</span><span class="cx"> this._dataGrid.scrollContainer.scrollTop = this._treeOutline.element.parentNode.scrollTop;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _dataGridGainedFocus(event)
+ {
+ this._treeOutline.element.classList.add("force-focus");
+ }
+
+ _dataGridLostFocus(event)
+ {
+ this._treeOutline.element.classList.remove("force-focus");
+ }
+
</ins><span class="cx"> _dataGridScrolled(event)
</span><span class="cx"> {
</span><span class="cx"> if (!this._enabled)
</span><span class="lines">@@ -217,6 +233,16 @@
</span><span class="cx"> dataGridNode.__treeElement.collapse();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _treeOutlineGainedFocus(event)
+ {
+ this._dataGrid.element.classList.add("force-focus");
+ }
+
+ _treeOutlineLostFocus(event)
+ {
+ this._dataGrid.element.classList.remove("force-focus");
+ }
+
</ins><span class="cx"> _treeElementSelected(treeElement, selectedByUser)
</span><span class="cx"> {
</span><span class="cx"> if (!this._enabled)
</span></span></pre>
</div>
</div>
</body>
</html>