Commit 18a6dfc2 authored by pfeldman@chromium.org's avatar pfeldman@chromium.org

Revert of DevTools: Do not save split view size on show mode changes....

Revert of DevTools: Do not save split view size on show mode changes. (https://codereview.chromium.org/185943004/)

Reason for revert:
Split location is no longer persisted.

Original issue's description:
> DevTools: Do not save split view size on show mode changes.
> 
> BUG=348887
> R=dgozman
> 
> Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=168608

TBR=dgozman@chromium.org,vsevik@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=348887

Review URL: https://codereview.chromium.org/185063005

git-svn-id: svn://svn.chromium.org/blink/trunk@168626 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 3127159d
...@@ -24,14 +24,12 @@ function test() ...@@ -24,14 +24,12 @@ function test()
delete settingValue.vertical.size; delete settingValue.vertical.size;
setting.set(settingValue); setting.set(settingValue);
forceSettingRead(panel._splitView);
panel._showRequest(request); panel._showRequest(request);
InspectorTest.addResult("Sidebar width: " + panel._splitView.sidebarElement().offsetWidth); InspectorTest.addResult("Sidebar width: " + panel._splitView.sidebarElement().offsetWidth);
panel._toggleGridMode(); panel._toggleGridMode();
settingValue.vertical.size = 242; settingValue.vertical.size = 242;
setting.set(settingValue); setting.set(settingValue);
forceSettingRead(panel._splitView);
panel._showRequest(request); panel._showRequest(request);
InspectorTest.addResult("Sidebar width: " + panel._splitView.sidebarElement().offsetWidth); InspectorTest.addResult("Sidebar width: " + panel._splitView.sidebarElement().offsetWidth);
panel._closeVisibleRequest(request); panel._closeVisibleRequest(request);
...@@ -41,12 +39,6 @@ function test() ...@@ -41,12 +39,6 @@ function test()
InspectorTest.completeTest(); InspectorTest.completeTest();
} }
function forceSettingRead(splitView)
{
splitView.setVertical(false);
splitView.setVertical(true);
}
} }
</script> </script>
</head> </head>
......
...@@ -68,11 +68,11 @@ WebInspector.SplitView = function(isVertical, secondIsSidebar, settingName, defa ...@@ -68,11 +68,11 @@ WebInspector.SplitView = function(isVertical, secondIsSidebar, settingName, defa
this._resizable = true; this._resizable = true;
this._useDip = !!useDip; this._useDip = !!useDip;
this._defaultSidebarWidth = defaultSidebarWidth || 200; this._savedSidebarWidth = defaultSidebarWidth || 200;
this._defaultSidebarHeight = defaultSidebarHeight || this._defaultSidebarWidth; this._savedSidebarHeight = defaultSidebarHeight || this._savedSidebarWidth;
if (0 < this._defaultSidebarWidth && this._defaultSidebarWidth < 1 && if (0 < this._savedSidebarWidth && this._savedSidebarWidth < 1 &&
0 < this._defaultSidebarHeight && this._defaultSidebarHeight < 1) 0 < this._savedSidebarHeight && this._savedSidebarHeight < 1)
this._useFraction = true; this._useFraction = true;
this._settingName = settingName; this._settingName = settingName;
...@@ -136,7 +136,6 @@ WebInspector.SplitView.prototype = { ...@@ -136,7 +136,6 @@ WebInspector.SplitView.prototype = {
this.element.classList.add(this._isVertical ? "hbox" : "vbox"); this.element.classList.add(this._isVertical ? "hbox" : "vbox");
delete this._resizerElementSize; delete this._resizerElementSize;
this._sidebarSize = -1; this._sidebarSize = -1;
this._preferredSidebarSize = this._savedSidebarSize();
}, },
/** /**
...@@ -145,7 +144,7 @@ WebInspector.SplitView.prototype = { ...@@ -145,7 +144,7 @@ WebInspector.SplitView.prototype = {
_updateLayout: function(animate) _updateLayout: function(animate)
{ {
delete this._totalSize; // Lazy update. delete this._totalSize; // Lazy update.
this._innerSetSidebarSize(this._preferredSidebarSize, false, animate); this._innerSetSidebarSize(this._lastSidebarSize(), false, animate);
}, },
/** /**
...@@ -236,7 +235,7 @@ WebInspector.SplitView.prototype = { ...@@ -236,7 +235,7 @@ WebInspector.SplitView.prototype = {
*/ */
desiredSidebarSize: function() desiredSidebarSize: function()
{ {
return this._preferredSidebarSize; return this._lastSidebarSize();
}, },
/** /**
...@@ -352,7 +351,7 @@ WebInspector.SplitView.prototype = { ...@@ -352,7 +351,7 @@ WebInspector.SplitView.prototype = {
setSidebarSize: function(size) setSidebarSize: function(size)
{ {
this._innerSetSidebarSize(size); this._innerSetSidebarSize(size);
this._updatePreferredSidebarSize(); this._saveSetting();
}, },
/** /**
...@@ -629,6 +628,7 @@ WebInspector.SplitView.prototype = { ...@@ -629,6 +628,7 @@ WebInspector.SplitView.prototype = {
if (!this._resizable) if (!this._resizable)
return false; return false;
this._saveSetting();
this._dragOffset = (this._secondIsSidebar ? this.totalSize() - this._sidebarSize : this._sidebarSize) - (this._isVertical ? event.pageX : event.pageY); this._dragOffset = (this._secondIsSidebar ? this.totalSize() - this._sidebarSize : this._sidebarSize) - (this._isVertical ? event.pageX : event.pageY);
return true; return true;
}, },
...@@ -650,7 +650,7 @@ WebInspector.SplitView.prototype = { ...@@ -650,7 +650,7 @@ WebInspector.SplitView.prototype = {
_endResizerDragging: function(event) _endResizerDragging: function(event)
{ {
delete this._dragOffset; delete this._dragOffset;
this._updatePreferredSidebarSize(); this._saveSetting();
}, },
hideDefaultResizer: function() hideDefaultResizer: function()
...@@ -728,12 +728,12 @@ WebInspector.SplitView.prototype = { ...@@ -728,12 +728,12 @@ WebInspector.SplitView.prototype = {
/** /**
* @return {number} * @return {number}
*/ */
_savedSidebarSize: function() _lastSidebarSize: function()
{ {
var settingForOrientation = this._settingForOrientation(); var settingForOrientation = this._settingForOrientation();
var size = settingForOrientation ? settingForOrientation.size : 0; var size = settingForOrientation ? settingForOrientation.size : 0;
if (!size) if (!size)
size = this._isVertical ? this._defaultSidebarWidth : this._defaultSidebarHeight; size = this._isVertical ? this._savedSidebarWidth : this._savedSidebarHeight;
if (this._useFraction) if (this._useFraction)
size *= this.totalSize(); size *= this.totalSize();
return size; return size;
...@@ -759,15 +759,16 @@ WebInspector.SplitView.prototype = { ...@@ -759,15 +759,16 @@ WebInspector.SplitView.prototype = {
return size; return size;
}, },
_updatePreferredSidebarSize: function()
{
this._preferredSidebarSize = this._sizeToSave();
this._saveSetting();
},
_saveSetting: function() _saveSetting: function()
{ {
var size = this._preferredSidebarSize; var size = this._sizeToSave();
if (size !== -1) {
if (this._isVertical)
this._savedSidebarWidth = size;
else
this._savedSidebarHeight = size;
}
var setting = this._setting(); var setting = this._setting();
if (!setting) if (!setting)
...@@ -792,7 +793,7 @@ WebInspector.SplitView.prototype = { ...@@ -792,7 +793,7 @@ WebInspector.SplitView.prototype = {
{ {
var data = /** @type {{from: number, to: number}} */ (event.data); var data = /** @type {{from: number, to: number}} */ (event.data);
this._innerSetSidebarSize(this.sidebarSize() * data.from / data.to, true); this._innerSetSidebarSize(this.sidebarSize() * data.from / data.to, true);
this._updatePreferredSidebarSize(); this._saveSetting();
}, },
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment