<!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>[203912] 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/203912">203912</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 11:58:23 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/195456">r195456</a>): Web Inspector: Changing tabs in Styles sidebar shouldn't change sidebar's width
https://bugs.webkit.org/show_bug.cgi?id=159646
<rdar://problem/27286338>
Reviewed by Brian Burg.
Remember sidebar width on per tab basis. For example, Node, Styles, and Layers sidebar panels in
Elements tab should all have the same width, but Resource sidebar panel in Debugger tab should NOT
share its width Element tab's sidebar.
TabContentView stores the width but TabBrowser manages saving and restoring it.
The same way collapsed sidebar state is handled.
* UserInterface/Views/Sidebar.js:
(WebInspector.Sidebar.prototype.set collapsed):
Don't change sidebar's width when sidebar panels change.
(WebInspector.Sidebar.prototype._recalculateWidth):
(WebInspector.Sidebar.prototype.set selectedSidebarPanel): Deleted.
Pass newWidth as an argument so it can be saved in TabBrowser.
* UserInterface/Views/SidebarPanel.js:
(WebInspector.SidebarPanel): Deleted.
(WebInspector.SidebarPanel.prototype.get savedWidth): Deleted.
(WebInspector.SidebarPanel.prototype.sizeDidChange): Deleted.
Remove the per sidebar panel width setting that was added in <a href="http://trac.webkit.org/projects/webkit/changeset/195456">r195456</a>.
* UserInterface/Views/TabBrowser.js:
(WebInspector.TabBrowser):
(WebInspector.TabBrowser.prototype._detailsSidebarWidthDidChange):
(WebInspector.TabBrowser.prototype._showDetailsSidebarPanelsForTabContentView):
* UserInterface/Views/TabContentView.js:
(WebInspector.TabContentView):
(WebInspector.TabContentView.prototype.get detailsSidebarWidthSetting):
Store details sidebar width on TabContentView.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs">trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (203911 => 203912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-07-29 18:52:53 UTC (rev 203911)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-07-29 18:58:23 UTC (rev 203912)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-07-29 Nikita Vasilyev <nvasilyev@apple.com>
+
+ REGRESSION (r195456): Web Inspector: Changing tabs in Styles sidebar shouldn't change sidebar's width
+ https://bugs.webkit.org/show_bug.cgi?id=159646
+ <rdar://problem/27286338>
+
+ Reviewed by Brian Burg.
+
+ Remember sidebar width on per tab basis. For example, Node, Styles, and Layers sidebar panels in
+ Elements tab should all have the same width, but Resource sidebar panel in Debugger tab should NOT
+ share its width Element tab's sidebar.
+
+ TabContentView stores the width but TabBrowser manages saving and restoring it.
+ The same way collapsed sidebar state is handled.
+
+ * UserInterface/Views/Sidebar.js:
+ (WebInspector.Sidebar.prototype.set collapsed):
+ Don't change sidebar's width when sidebar panels change.
+
+ (WebInspector.Sidebar.prototype._recalculateWidth):
+ (WebInspector.Sidebar.prototype.set selectedSidebarPanel): Deleted.
+ Pass newWidth as an argument so it can be saved in TabBrowser.
+
+ * UserInterface/Views/SidebarPanel.js:
+ (WebInspector.SidebarPanel): Deleted.
+ (WebInspector.SidebarPanel.prototype.get savedWidth): Deleted.
+ (WebInspector.SidebarPanel.prototype.sizeDidChange): Deleted.
+ Remove the per sidebar panel width setting that was added in r195456.
+
+ * UserInterface/Views/TabBrowser.js:
+ (WebInspector.TabBrowser):
+ (WebInspector.TabBrowser.prototype._detailsSidebarWidthDidChange):
+ (WebInspector.TabBrowser.prototype._showDetailsSidebarPanelsForTabContentView):
+ * UserInterface/Views/TabContentView.js:
+ (WebInspector.TabContentView):
+ (WebInspector.TabContentView.prototype.get detailsSidebarWidthSetting):
+ Store details sidebar width on TabContentView.
+
</ins><span class="cx"> 2016-07-29 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Assertion in NetworkGridContentView when updating data grid for the first time
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSidebarjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js (203911 => 203912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2016-07-29 18:52:53 UTC (rev 203911)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/Sidebar.js 2016-07-29 18:58:23 UTC (rev 203912)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> if (this._selectedSidebarPanel.visible) {
</span><span class="cx"> this._selectedSidebarPanel.shown();
</span><span class="cx"> this._selectedSidebarPanel.visibilityDidChange();
</span><del>- this._recalculateWidth(this._selectedSidebarPanel.savedWidth);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,10 +199,9 @@
</span><span class="cx"> this._navigationBar.needsLayout();
</span><span class="cx">
</span><span class="cx"> if (this._selectedSidebarPanel) {
</span><del>- if (this._selectedSidebarPanel.visible) {
</del><ins>+ if (this._selectedSidebarPanel.visible)
</ins><span class="cx"> this._selectedSidebarPanel.shown();
</span><del>- this._recalculateWidth(this._selectedSidebarPanel.savedWidth);
- } else
</del><ins>+ else
</ins><span class="cx"> this._selectedSidebarPanel.hidden();
</span><span class="cx">
</span><span class="cx"> this._selectedSidebarPanel.visibilityDidChange();
</span><span class="lines">@@ -266,8 +264,8 @@
</span><span class="cx"> _recalculateWidth(newWidth = this.width)
</span><span class="cx"> {
</span><span class="cx"> // Need to add 1 because of the 1px border-right.
</span><del>- newWidth = Number.constrain(newWidth, this.minimumWidth + 1, this.maximumWidth);
- this.element.style.width = Math.ceil(newWidth) + "px";
</del><ins>+ newWidth = Math.ceil(Number.constrain(newWidth, this.minimumWidth + 1, this.maximumWidth));
+ this.element.style.width = `${newWidth}px`;
</ins><span class="cx">
</span><span class="cx"> if (!this.collapsed && this._navigationBar)
</span><span class="cx"> this._navigationBar.needsLayout();
</span><span class="lines">@@ -275,7 +273,7 @@
</span><span class="cx"> if (!this.collapsed && this._selectedSidebarPanel)
</span><span class="cx"> this._selectedSidebarPanel.updateLayout(WebInspector.View.LayoutReason.Resize);
</span><span class="cx">
</span><del>- this.dispatchEventToListeners(WebInspector.Sidebar.Event.WidthDidChange);
</del><ins>+ this.dispatchEventToListeners(WebInspector.Sidebar.Event.WidthDidChange, {newWidth});
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _navigationItemSelected(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js (203911 => 203912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2016-07-29 18:52:53 UTC (rev 203911)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SidebarPanel.js 2016-07-29 18:58:23 UTC (rev 203912)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> this._displayName = displayName;
</span><span class="cx"> this._selected = false;
</span><span class="cx">
</span><del>- this._widthSetting = new WebInspector.Setting(identifier + "-sidebar-panel-width", 300);
</del><span class="cx"> this._savedScrollPosition = 0;
</span><span class="cx">
</span><span class="cx"> this.element.classList.add("panel", identifier);
</span><span class="lines">@@ -93,11 +92,6 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get savedWidth()
- {
- return this._widthSetting.value;
- }
-
</del><span class="cx"> show()
</span><span class="cx"> {
</span><span class="cx"> if (!this.parentSidebar)
</span><span class="lines">@@ -151,15 +145,4 @@
</span><span class="cx"> {
</span><span class="cx"> // Implemented by subclasses.
</span><span class="cx"> }
</span><del>-
- // Protected
-
- sizeDidChange()
- {
- let width = this.element.realOffsetWidth;
- if (width && width !== this._widthSetting.value)
- this._widthSetting.value = width;
-
- // Implemented by subclasses.
- }
</del><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js (203911 => 203912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2016-07-29 18:52:53 UTC (rev 203911)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabBrowser.js 2016-07-29 18:58:23 UTC (rev 203912)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> if (this._detailsSidebar) {
</span><span class="cx"> this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.CollapsedStateDidChange, this._sidebarCollapsedStateDidChange, this);
</span><span class="cx"> this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.SidebarPanelSelected, this._sidebarPanelSelected, this);
</span><ins>+ this._detailsSidebar.addEventListener(WebInspector.Sidebar.Event.WidthDidChange, this._detailsSidebarWidthDidChange, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._contentViewContainer = new WebInspector.ContentViewContainer;
</span><span class="lines">@@ -275,6 +276,19 @@
</span><span class="cx"> tabContentView.detailsSidebarCollapsedSetting.value = this._detailsSidebar.collapsed;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _detailsSidebarWidthDidChange(event)
+ {
+ if (this._ignoreSidebarEvents)
+ return;
+
+ let tabContentView = this.selectedTabContentView;
+ if (!tabContentView)
+ return;
+
+ if (event.target === this._detailsSidebar && event.data)
+ tabContentView.detailsSidebarWidthSetting.value = event.data.newWidth;
+ }
+
</ins><span class="cx"> _showNavigationSidebarPanelForTabContentView(tabContentView)
</span><span class="cx"> {
</span><span class="cx"> if (!this._navigationSidebar)
</span><span class="lines">@@ -323,6 +337,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (tabContentView.detailsSidebarWidthSetting.value)
+ this._detailsSidebar.width = tabContentView.detailsSidebarWidthSetting.value;
+
</ins><span class="cx"> if (tabContentView.managesDetailsSidebarPanels) {
</span><span class="cx"> tabContentView.showDetailsSidebarPanels();
</span><span class="cx"> this._ignoreSidebarEvents = false;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (203911 => 203912)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2016-07-29 18:52:53 UTC (rev 203911)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2016-07-29 18:58:23 UTC (rev 203912)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx">
</span><span class="cx"> this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
</span><span class="cx"> this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
</span><ins>+ this._detailsSidebarWidthSetting = new WebInspector.Setting(identifier + "-details-sidebar-width", 0);
</ins><span class="cx">
</span><span class="cx"> this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
</span><span class="cx"> }
</span><span class="lines">@@ -177,6 +178,11 @@
</span><span class="cx"> return this._navigationSidebarCollapsedSetting;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get detailsSidebarWidthSetting()
+ {
+ return this._detailsSidebarWidthSetting;
+ }
+
</ins><span class="cx"> get detailsSidebarPanels()
</span><span class="cx"> {
</span><span class="cx"> return this._detailsSidebarPanels;
</span></span></pre>
</div>
</div>
</body>
</html>