<!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>[200962] 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/200962">200962</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-05-16 13:19:24 -0700 (Mon, 16 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Contents of Duration column are covered by always on (legacy) scroll bars
https://bugs.webkit.org/show_bug.cgi?id=157590
Reviewed by Timothy Hatcher.
Set the right padding of the DataGrid header to match the scrollbar width.
* UserInterface/Views/DataGrid.css:
(.data-grid .data-container):
(.data-grid.inline .data-container):
Don't show scrollbars for inline data grids.
(.data-grid > .header-wrapper):
(.data-grid.no-header > .header-wrapper > table.header):
(.data-grid.no-header > table.header): Deleted.
(.data-grid th): Deleted.
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid):
We can't add padding-rigth to a table. Wrap the table in div.header-wrapper.
(WebInspector.DataGrid.prototype._updateScrollbarPadding):
(WebInspector.DataGrid.prototype.layout):</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="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200961 => 200962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-16 20:01:03 UTC (rev 200961)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-16 20:19:24 UTC (rev 200962)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2016-05-16 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Contents of Duration column are covered by always on (legacy) scroll bars
+ https://bugs.webkit.org/show_bug.cgi?id=157590
+
+ Reviewed by Timothy Hatcher.
+
+ Set the right padding of the DataGrid header to match the scrollbar width.
+
+ * UserInterface/Views/DataGrid.css:
+ (.data-grid .data-container):
+ (.data-grid.inline .data-container):
+ Don't show scrollbars for inline data grids.
+
+ (.data-grid > .header-wrapper):
+ (.data-grid.no-header > .header-wrapper > table.header):
+ (.data-grid.no-header > table.header): Deleted.
+ (.data-grid th): Deleted.
+ * UserInterface/Views/DataGrid.js:
+ (WebInspector.DataGrid):
+ We can't add padding-rigth to a table. Wrap the table in div.header-wrapper.
+
+ (WebInspector.DataGrid.prototype._updateScrollbarPadding):
+ (WebInspector.DataGrid.prototype.layout):
+
+2016-05-16 Nikita Vasilyev <nvasilyev@apple.com>
+
</ins><span class="cx"> Web Inspector: Background stripes don't span the width of Network sidebar
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157744
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css (200961 => 200962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-05-16 20:01:03 UTC (rev 200961)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.css 2016-05-16 20:19:24 UTC (rev 200962)
</span><span class="lines">@@ -50,18 +50,23 @@
</span><span class="cx"> left: 0;
</span><span class="cx"> right: 0;
</span><span class="cx"> overflow-x: hidden;
</span><del>- overflow-y: overlay;
</del><ins>+ overflow-y: scroll;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .data-grid.inline .data-container {
</span><span class="cx"> position: static;
</span><ins>+ overflow-y: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .data-grid.inline {
</span><span class="cx"> border: 0.5px solid var(--border-color);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.data-grid.no-header > table.header {
</del><ins>+.data-grid > .header-wrapper {
+ border-bottom: 0.5px solid var(--border-color);
+}
+
+.data-grid.no-header > .header-wrapper > table.header {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,8 +80,6 @@
</span><span class="cx">
</span><span class="cx"> background-color: white;
</span><span class="cx">
</span><del>- border-bottom: 0.5px solid var(--border-color);
-
</del><span class="cx"> font-weight: normal;
</span><span class="cx">
</span><span class="cx"> height: 22px;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (200961 => 200962)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-16 20:01:03 UTC (rev 200961)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js 2016-05-16 20:19:24 UTC (rev 200962)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> this.rowHeight = 20;
</span><span class="cx"> this.resizers = [];
</span><span class="cx"> this._columnWidthsInitialized = false;
</span><ins>+ this._scrollbarWidth = 0;
</ins><span class="cx">
</span><span class="cx"> this._cachedScrollTop = NaN;
</span><span class="cx"> this._cachedScrollableOffsetHeight = NaN;
</span><span class="lines">@@ -67,8 +68,13 @@
</span><span class="cx"> this.element.addEventListener("keydown", this._keyDown.bind(this), false);
</span><span class="cx"> this.element.copyHandler = this;
</span><span class="cx">
</span><ins>+ this._headerWrapperElement = document.createElement("div");
+ this._headerWrapperElement.classList.add("header-wrapper");
+
</ins><span class="cx"> this._headerTableElement = document.createElement("table");
</span><span class="cx"> this._headerTableElement.className = "header";
</span><ins>+ this._headerWrapperElement.appendChild(this._headerTableElement);
+
</ins><span class="cx"> this._headerTableColumnGroupElement = this._headerTableElement.createChild("colgroup");
</span><span class="cx"> this._headerTableBodyElement = this._headerTableElement.createChild("tbody");
</span><span class="cx"> this._headerTableRowElement = this._headerTableBodyElement.createChild("tr");
</span><span class="lines">@@ -109,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> this._fillerRowElement = this.dataTableBodyElement.createChild("tr", "filler");
</span><span class="cx">
</span><del>- this.element.appendChild(this._headerTableElement);
</del><ins>+ this.element.appendChild(this._headerWrapperElement);
</ins><span class="cx"> this.element.appendChild(this._scrollContainerElement);
</span><span class="cx">
</span><span class="cx"> if (preferredColumnOrder) {
</span><span class="lines">@@ -119,8 +125,23 @@
</span><span class="cx"> for (var columnIdentifier in columnsData)
</span><span class="cx"> this.insertColumn(columnIdentifier, columnsData[columnIdentifier]);
</span><span class="cx"> }
</span><ins>+
+ this._updateScrollbarPadding();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ _updateScrollbarPadding()
+ {
+ if (this._inline)
+ return;
+
+ let scrollbarWidth = this._scrollContainerElement.offsetWidth - this._scrollContainerElement.scrollWidth;
+ if (this._scrollbarWidth === scrollbarWidth)
+ return;
+
+ this._headerWrapperElement.style.paddingRight = scrollbarWidth + "px";
+ this._scrollbarWidth = scrollbarWidth;
+ }
+
</ins><span class="cx"> static createSortableDataGrid(columnNames, values)
</span><span class="cx"> {
</span><span class="cx"> var numColumns = columnNames.length;
</span><span class="lines">@@ -806,6 +827,7 @@
</span><span class="cx"> if (layoutReason === WebInspector.View.LayoutReason.Resize || firstUpdate) {
</span><span class="cx"> this._positionResizerElements();
</span><span class="cx"> this._positionHeaderViews();
</span><ins>+ this._updateScrollbarPadding();
</ins><span class="cx">
</span><span class="cx"> this._cachedScrollTop = NaN;
</span><span class="cx"> this._cachedScrollableOffsetHeight = NaN;
</span></span></pre>
</div>
</div>
</body>
</html>