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

Source/devtools/front_end/SplitView.js

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  * 1. Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *
@@ skipping 50 matching lines @@
         this._sidebarView.show(this.element);
         this._mainView.show(this.element);
     }
 
     this._onDragStartBound = this._onDragStart.bind(this);
     this._resizerElements = [];
 
     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;
 
     this.setSecondIsSidebar(secondIsSidebar);
 
     this._innerSetVertical(isVertical);
     this._showMode = WebInspector.SplitView.ShowMode.Both;
 
     // Should be called after isVertical has the right value.
@@ skipping 43 matching lines @@
     /**
      * @param {boolean} isVertical
      */
     _innerSetVertical: function(isVertical)
     {
         this.element.classList.remove(this._isVertical ? "hbox" : "vbox");
         this._isVertical = isVertical;
         this.element.classList.add(this._isVertical ? "hbox" : "vbox");
         delete this._resizerElementSize;
         this._sidebarSize = -1;
+        this._restoreSidebarSizeFromSettings();
+        if (this._shouldSaveShowMode)
+            this._restoreAndApplyShowModeFromSettings();
     },
 
     /**
      * @param {boolean=} animate
      */
     _updateLayout: function(animate)
     {
         delete this._totalSize; // Lazy update.
-        this._innerSetSidebarSize(this._lastSidebarSize(), false, animate);
+        this._innerSetSidebarSize(this._preferredSidebarSize(), false, animate);
     },
 
     /**
      * @return {!Element}
      */
     mainElement: function()
     {
         return this._mainElement;
     },
 
     /**
      * @return {!Element}
      */
     sidebarElement: function()
     {
         return this._sidebarElement;
     },
 
     /**
      * @return {boolean}
      */
     isSidebarSecond: function()
     {
         return this._secondIsSidebar;
     },
 
     enableShowModeSaving: function()
     {
         this._shouldSaveShowMode = true;
-        var savedShowMode = this._savedShowMode();
-        switch (savedShowMode) {
-        case WebInspector.SplitView.ShowMode.Both:
-            this.showBoth();
-            break;
-        case WebInspector.SplitView.ShowMode.OnlyMain:
-            this.hideSidebar();
-            break;
-        case WebInspector.SplitView.ShowMode.OnlySidebar:
-            this.hideMain();
-            break;
-        }
+        this._restoreAndApplyShowModeFromSettings();
     },
 
     /**
      * @return {string}
      */
     showMode: function()
     {
         return this._showMode;
     },
 
@@ skipping 27 matching lines @@
         if (this._isShowingOne)
             return null;
         return this._isVertical ?
             (this._secondIsSidebar ? "right" : "left") :
             (this._secondIsSidebar ? "bottom" : "top");
     },
 
     /**
      * @return {number}
      */
-    desiredSidebarSize: function()
+    preferredSidebarSize: function()
     {
-        return this._lastSidebarSize();
+        return this._preferredSidebarSize();
     },
 
     /**
      * @return {!Element}
      */
     resizerElement: function()
     {
         return this._resizerElement;
     },
 
@@ skipping 95 matching lines @@
         this._resizable = resizable;
         this._resizerElement.classList.toggle("hidden", !resizable);
     },
 
     /**
      * @param {number} size
      */
     setSidebarSize: function(size)
     {
         this._innerSetSidebarSize(size);
-        this._saveSetting();
+        this._saveSidebarSizeToSettings();
     },
 
     /**
      * @return {number}
      */
     sidebarSize: function()
     {
         return Math.max(0, this._sidebarSize);
     },
 
     /**
      * @return {number}
      */
     totalSize: function()
     {
         if (!this._totalSize)
             this._totalSize = this._isVertical ? this.element.offsetWidth : this.element.offsetHeight;
         return this._totalSize;
     },
 
     /**
      * @param {string} showMode
      */
     _updateShowMode: function(showMode)
     {
         this._showMode = showMode;
-        this._saveSetting();
+        this._saveShowModeToSettings();
         this._updateShowHideSidebarButton();
         this.dispatchEventToListeners(WebInspector.SplitView.Events.ShowModeChanged, showMode);
     },
 
     /**
      * @param {number} size
      * @param {boolean=} ignoreConstraints
      * @param {boolean=} animate
      */
     _innerSetSidebarSize: function(size, ignoreConstraints, animate)
@@ skipping 206 matching lines @@
         if (fromInPercents && sidebarSize <= to && to < totalSize)
             return to;
 
         return -1;
     },
 
     wasShown: function()
     {
         if (this._useDip)
             WebInspector.zoomManager.addEventListener(WebInspector.ZoomManager.Events.ZoomChanged, this._onZoomChanged, this);
+        this._restoreSidebarSizeFromSettings();

[dgozman, 2014/03/07 11:32:53]

Remove this.

         this._updateLayout();
     },
 
     willHide: function()
     {
         if (this._useDip)
             WebInspector.zoomManager.removeEventListener(WebInspector.ZoomManager.Events.ZoomChanged, this._onZoomChanged, this);
     },
 
     onResize: function()
     {
         this._updateLayout();
     },
 
     /**
      * @param {!MouseEvent} event
      * @return {boolean}
      */
     _startResizerDragging: function(event)
     {
         if (!this._resizable)
             return false;
 
-        this._saveSetting();
         this._dragOffset = (this._secondIsSidebar ? this.totalSize() - this._sidebarSize : this._sidebarSize) - (this._isVertical ? event.pageX : event.pageY);
         return true;
     },
 
     /**
      * @param {!MouseEvent} event
      */
     _resizerDragging: function(event)
     {
         var newOffset = (this._isVertical ? event.pageX : event.pageY) + this._dragOffset;
         var newSize = (this._secondIsSidebar ? this.totalSize() - newOffset : newOffset);
         this.setSidebarSize(newSize);
         event.preventDefault();
     },
 
     /**
      * @param {!MouseEvent} event
      */
     _endResizerDragging: function(event)
     {
         delete this._dragOffset;
-        this._saveSetting();
+        this._saveSidebarSizeToSettings();
     },
 
     hideDefaultResizer: function()
     {
         this.element.classList.add("split-view-no-resizer");
     },
 
     /**
      * @param {!Element} resizerElement
      */
@@ skipping 57 matching lines @@
      */
     _settingForOrientation: function()
     {
         var state = this._setting() ? this._setting().get() : {};
         return this._isVertical ? state.vertical : state.horizontal;
     },
 
     /**
      * @return {number}
      */
-    _lastSidebarSize: function()
+    _preferredSidebarSize: function()
     {
-        var settingForOrientation = this._settingForOrientation();
-        var size = settingForOrientation ? settingForOrientation.size : 0;
-        if (!size)
-             size = this._isVertical ? this._savedSidebarWidth : this._savedSidebarHeight;
+        var size = this._savedSidebarSize;
         if (this._useFraction)
             size *= this.totalSize();
         return size;
     },
 
-    /**
-     * @return {string}
-     */
-    _savedShowMode: function()
+    _restoreSidebarSizeFromSettings: function()
+    {
+        var settingForOrientation = this._settingForOrientation();
+        var size = settingForOrientation ? settingForOrientation.size : 0;
+        if (!size)
+             size = this._isVertical ? this._defaultSidebarWidth : this._defaultSidebarHeight;
+        this._savedSidebarSize = size;
+    },
+
+    _restoreAndApplyShowModeFromSettings: function()
     {
         var orientationState = this._settingForOrientation();
-        return orientationState ? orientationState.showMode : "";
+        this._savedShowMode = orientationState ? orientationState.showMode : WebInspector.SplitView.ShowMode.Both;
+        this._showMode = this._savedShowMode;
+
+        switch (this._savedShowMode) {
+        case WebInspector.SplitView.ShowMode.Both:
+            this.showBoth();
+            break;
+        case WebInspector.SplitView.ShowMode.OnlyMain:
+            this.hideSidebar();
+            break;
+        case WebInspector.SplitView.ShowMode.OnlySidebar:
+            this.hideMain();
+            break;
+        }
     },
 
-    _sizeToSave: function()
+    _saveSidebarSizeToSettings: function()
     {
+        if (this._sidebarSize < 0)
+            return;
+
         var size = this._sidebarSize;
-        if (size < 0)
-            return -1;
-
         if (this._useFraction)
             size /= this.totalSize();
-        return size;
+        this._savedSidebarSize = size;
+        this._saveSetting();
+    },
+
+    _saveShowModeToSettings: function()
+    {
+        this._savedShowMode = this._showMode;
+        this._saveSetting();
     },
 
     _saveSetting: function()
     {
-        var size = this._sizeToSave();
-
-        if (size !== -1) {
-            if (this._isVertical)
-                this._savedSidebarWidth = size;
-            else
-                this._savedSidebarHeight = size;
-        }
-
         var setting = this._setting();
         if (!setting)
             return;
         var state = setting.get();
         var orientationState = (this._isVertical ? state.vertical : state.horizontal) || {};
-        if (size !== -1)
-            orientationState.size = size;
+
+        orientationState.size = this._savedSidebarSize;
         if (this._shouldSaveShowMode)
-            orientationState.showMode = this._showMode;
+            orientationState.showMode = this._savedShowMode;
+
         if (this._isVertical)
             state.vertical = orientationState;
         else
             state.horizontal = orientationState;
         setting.set(state);
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _onZoomChanged: function(event)
     {
         var data = /** @type {{from: number, to: number}} */ (event.data);
         this._innerSetSidebarSize(this.sidebarSize() * data.from / data.to, true);
-        this._saveSetting();
+        this._saveSidebarSizeToSettings();
     },
 
     /**
      * @param {string} title
      * @param {string} className
      * @return {!WebInspector.StatusBarButton}
      */
     createShowHideSidebarButton: function(title, className)
     {
         console.assert(this.isVertical(), "Buttons for split view with horizontal split are not supported yet.");
@@ skipping 22 matching lines @@
     _updateShowHideSidebarButton: function()
     {
         if (!this._showHideSidebarButton)
             return;
         this._showHideSidebarButton.state = this._isShowingOne === this.isSidebarSecond() ? "left" : "right";
         this._showHideSidebarButton.title = this._isShowingOne ? WebInspector.UIString("Show %s", this._showHideSidebarButtonTitle) : WebInspector.UIString("Hide %s", this._showHideSidebarButtonTitle);
     },
 
     __proto__: WebInspector.View.prototype
 }