Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1284)

Unified Diff: Source/devtools/front_end/SplitView.js

Issue 185943004: DevTools: Do not save split view size on show mode changes. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/SplitView.js
diff --git a/Source/devtools/front_end/SplitView.js b/Source/devtools/front_end/SplitView.js
index c5958d8e9987283fdce7cd15fd355bc92e725e61..88f234ee050783cdbacf87338a42d0dab94f19db 100644
--- a/Source/devtools/front_end/SplitView.js
+++ b/Source/devtools/front_end/SplitView.js
@@ -68,11 +68,11 @@ WebInspector.SplitView = function(isVertical, secondIsSidebar, settingName, defa
this._resizable = true;
this._useDip = !!useDip;
- this._savedSidebarWidth = defaultSidebarWidth || 200;
- this._savedSidebarHeight = defaultSidebarHeight || this._savedSidebarWidth;
+ this._defaultSidebarWidth = defaultSidebarWidth || 200;
+ this._defaultSidebarHeight = defaultSidebarHeight || this._defaultSidebarWidth;
- if (0 < this._savedSidebarWidth && this._savedSidebarWidth < 1 &&
- 0 < this._savedSidebarHeight && this._savedSidebarHeight < 1)
+ if (0 < this._defaultSidebarWidth && this._defaultSidebarWidth < 1 &&
+ 0 < this._defaultSidebarHeight && this._defaultSidebarHeight < 1)
this._useFraction = true;
this._settingName = settingName;
@@ -136,6 +136,7 @@ WebInspector.SplitView.prototype = {
this.element.classList.add(this._isVertical ? "hbox" : "vbox");
delete this._resizerElementSize;
this._sidebarSize = -1;
+ this._preferredSidebarSize = this._savedSidebarSize();
},
/**
@@ -144,7 +145,7 @@ WebInspector.SplitView.prototype = {
_updateLayout: function(animate)
{
delete this._totalSize; // Lazy update.
- this._innerSetSidebarSize(this._lastSidebarSize(), false, animate);
+ this._innerSetSidebarSize(this._preferredSidebarSize, false, animate);
},
/**
@@ -235,7 +236,7 @@ WebInspector.SplitView.prototype = {
*/
desiredSidebarSize: function()
{
- return this._lastSidebarSize();
+ return this._preferredSidebarSize;
},
/**
@@ -351,7 +352,7 @@ WebInspector.SplitView.prototype = {
setSidebarSize: function(size)
{
this._innerSetSidebarSize(size);
- this._saveSetting();
+ this._saveSizeToSetting();
},
/**
@@ -628,7 +629,7 @@ WebInspector.SplitView.prototype = {
if (!this._resizable)
return false;
- this._saveSetting();
+ this._saveSizeToSetting();
dgozman 2014/03/05 17:52:53 We agreed this is not needed.
this._dragOffset = (this._secondIsSidebar ? this.totalSize() - this._sidebarSize : this._sidebarSize) - (this._isVertical ? event.pageX : event.pageY);
return true;
},
@@ -650,7 +651,7 @@ WebInspector.SplitView.prototype = {
_endResizerDragging: function(event)
{
delete this._dragOffset;
- this._saveSetting();
+ this._saveSizeToSetting();
},
hideDefaultResizer: function()
@@ -728,12 +729,12 @@ WebInspector.SplitView.prototype = {
/**
* @return {number}
*/
- _lastSidebarSize: function()
+ _savedSidebarSize: function()
{
var settingForOrientation = this._settingForOrientation();
var size = settingForOrientation ? settingForOrientation.size : 0;
if (!size)
- size = this._isVertical ? this._savedSidebarWidth : this._savedSidebarHeight;
+ size = this._isVertical ? this._defaultSidebarWidth : this._defaultSidebarHeight;
if (this._useFraction)
size *= this.totalSize();
return size;
@@ -759,16 +760,15 @@ WebInspector.SplitView.prototype = {
return size;
},
- _saveSetting: function()
+ _saveSizeToSetting: function()
dgozman 2014/03/05 17:52:53 Consider renaming to setPreferredSidebarSize.
{
- var size = this._sizeToSave();
+ this._preferredSidebarSize = this._sizeToSave();
+ this._saveSetting();
+ },
- if (size !== -1) {
- if (this._isVertical)
- this._savedSidebarWidth = size;
- else
- this._savedSidebarHeight = size;
- }
+ _saveSetting: function()
+ {
+ var size = this._preferredSidebarSize;
var setting = this._setting();
if (!setting)
@@ -793,7 +793,7 @@ WebInspector.SplitView.prototype = {
{
var data = /** @type {{from: number, to: number}} */ (event.data);
this._innerSetSidebarSize(this.sidebarSize() * data.from / data.to, true);
- this._saveSetting();
+ this._saveSizeToSetting();
},
/**
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698