[DevTools] Add preferred size to WebInspector.View.

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 368 matching lines @@
         this._showMode = showMode;
         this._saveShowModeToSettings();
         this._updateShowHideSidebarButton();
         this.dispatchEventToListeners(WebInspector.SplitView.Events.ShowModeChanged, showMode);
         this.invalidateMinimumSize();
     },
 
     /**
      * @param {number} size
      * @param {boolean} animate
+     * @param {boolean=} userAction
      */
-    _innerSetSidebarSize: function(size, animate)
+    _innerSetSidebarSize: function(size, animate, userAction)
     {
         if (this._showMode !== WebInspector.SplitView.ShowMode.Both || !this.isShowing())
             return;
 
-        size = this._applyConstraints(size);
+        size = this._applyConstraints(size, userAction);
         if (this._sidebarSize === size)
             return;
 
         this._removeAllLayoutProperties();
 
         var sizeValue = (size / WebInspector.zoomManager.zoomFactor()) + "px";
         this.sidebarElement().style.flexBasis = sizeValue;
 
         if (!this._resizerElementSize)
             this._resizerElementSize = this._isVertical ? this._resizerElement.offsetWidth : this._resizerElement.offsetHeight;
@@ skipping 104 matching lines @@
             delete this._animationFrameHandle;
         }
         if (this._animationCallback) {
             this._animationCallback();
             delete this._animationCallback;
         }
     },
 
     /**
      * @param {number} sidebarSize
+     * @param {boolean=} userAction
      * @return {number}
      */
-    _applyConstraints: function(sidebarSize)
+    _applyConstraints: function(sidebarSize, userAction)
     {
         var totalSize = this.totalSize();
 
         var size = this._sidebarView.minimumSize();
-        var from = this.isVertical() ? size.width : size.height;
-        if (!from)
-            from = WebInspector.SplitView.MinPadding;
+        var minSidebarSize = this.isVertical() ? size.width : size.height;
+        if (!minSidebarSize)
+            minSidebarSize = WebInspector.SplitView.MinPadding;
+
+        var preferredSidebarSize = this.isVertical() ? size.preferredWidth : size.preferredHeight;
+        if (!preferredSidebarSize)
+            preferredSidebarSize = WebInspector.SplitView.MinPadding;
+        // Allow sidebar to be less than preferred by explicit user action.
+        if (sidebarSize < preferredSidebarSize)
+            preferredSidebarSize = Math.max(sidebarSize, minSidebarSize);
 
         size = this._mainView.minimumSize();
         var minMainSize = this.isVertical() ? size.width : size.height;
         if (!minMainSize)
             minMainSize = WebInspector.SplitView.MinPadding;
 
-        var to = totalSize - minMainSize;
-        if (from <= to)
-            return Number.constrain(sidebarSize, from, to);
+        var preferredMainSize = this.isVertical() ? size.preferredWidth : size.preferredHeight;
+        if (!preferredMainSize)
+            preferredMainSize = WebInspector.SplitView.MinPadding;
+        var savedMainSize = this.isVertical() ? this._savedVerticalMainSize : this._savedHorizontalMainSize;
+        if (typeof savedMainSize !== "undefined")
+            preferredMainSize = Math.min(preferredMainSize, savedMainSize);
+        if (userAction)
+            preferredMainSize = minMainSize;
 
-        // If we don't have enough space (which is a very rare case), prioritize main view.
-        return Math.max(0, to);
+        // Enough space for preferred.
+        var totalPreferred = preferredMainSize + preferredSidebarSize;
+        if (totalPreferred <= totalSize)
+            return Number.constrain(sidebarSize, preferredSidebarSize, totalSize - preferredMainSize);
+
+        // Enough space for minimum.
+        if (totalPreferred > 0 && minMainSize + minSidebarSize <= totalSize) {

[vsevik, 2014/03/28 16:13:26]

How can totalPreferred > 0 be wrong?

[dgozman, 2014/03/28 18:05:02]

Done.

+            var delta = totalPreferred - totalSize;
+            var sidebarDelta = delta * preferredSidebarSize / totalPreferred;
+            sidebarSize = preferredSidebarSize - sidebarDelta;
+            return Number.constrain(sidebarSize, minSidebarSize, totalSize - minMainSize);
+        }
+
+        // Not enough space even for minimum sizes.
+        return Math.max(0, totalSize - minMainSize);
     },
 
     wasShown: function()
     {
         this._forceUpdateLayout();
         WebInspector.zoomManager.addEventListener(WebInspector.ZoomManager.Events.ZoomChanged, this._onZoomChanged, this);
     },
 
     willHide: function()
     {
@@ skipping 16 matching lines @@
     calculateMinimumSize: function()
     {
         if (this._showMode === WebInspector.SplitView.ShowMode.OnlyMain)
             return this._mainView.minimumSize();
         if (this._showMode === WebInspector.SplitView.ShowMode.OnlySidebar)
             return this._sidebarView.minimumSize();
 
         var mainSize = this._mainView.minimumSize();
         var sidebarSize = this._sidebarView.minimumSize();
         var min = WebInspector.SplitView.MinPadding;
-        if (this._isVertical)
-            return new Size((mainSize.width || min) + (sidebarSize.width || min), Math.max(mainSize.height, sidebarSize.height));
-        else
-            return new Size(Math.max(mainSize.width, sidebarSize.width), (mainSize.height || min) + (sidebarSize.height || min));
+        if (this._isVertical) {
+            mainSize = mainSize.widthToMax(new Size(min, 0));
+            sidebarSize = sidebarSize.widthToMax(new Size(min, 0));
+            return mainSize.addWidth(sidebarSize).heightToMax(sidebarSize);
+        } else {
+            mainSize = mainSize.heightToMax(new Size(0, min));
+            sidebarSize = sidebarSize.heightToMax(new Size(0, min));
+            return mainSize.widthToMax(sidebarSize).addHeight(sidebarSize);
+        }
     },
 
     /**
      * @param {!MouseEvent} event
      * @return {boolean}
      */
     _startResizerDragging: function(event)
     {
         if (!this._resizable)
             return false;
 
         var dipEventPosition = (this._isVertical ? event.pageX : event.pageY) * WebInspector.zoomManager.zoomFactor();
         this._dragOffset = (this._secondIsSidebar ? this.totalSize() - this._sidebarSize : this._sidebarSize) - dipEventPosition;
         return true;
     },
 
     /**
      * @param {!MouseEvent} event
      */
     _resizerDragging: function(event)
     {
         var dipEventPosition = (this._isVertical ? event.pageX : event.pageY) * WebInspector.zoomManager.zoomFactor();
         var newOffset = dipEventPosition + this._dragOffset;
         var newSize = (this._secondIsSidebar ? this.totalSize() - newOffset : newOffset);
-        var constrainedSize = this._applyConstraints(newSize);
+        var constrainedSize = this._applyConstraints(newSize, true);
         this._savedSidebarSize = constrainedSize;
         this._saveSetting();
-        this._innerSetSidebarSize(constrainedSize, false);
+        this._innerSetSidebarSize(constrainedSize, false, true);
+        if (this.isVertical())
+            this._savedVerticalMainSize = this.totalSize() - this._sidebarSize;
+        else
+            this._savedHorizontalMainSize = this.totalSize() - this._sidebarSize;
         event.preventDefault();
     },
 
     /**
      * @param {!MouseEvent} event
      */
     _endResizerDragging: function(event)
     {
         delete this._dragOffset;
     },
@@ skipping 205 matching lines @@
         this._showHideSidebarButton.state = sidebarHidden ? "show" : "hide";
         this._showHideSidebarButton.element.classList.toggle("top-sidebar-show-hide-button", !this.isVertical() && !this.isSidebarSecond());
         this._showHideSidebarButton.element.classList.toggle("right-sidebar-show-hide-button", this.isVertical() && this.isSidebarSecond());
         this._showHideSidebarButton.element.classList.toggle("bottom-sidebar-show-hide-button", !this.isVertical() && this.isSidebarSecond());
         this._showHideSidebarButton.element.classList.toggle("left-sidebar-show-hide-button", this.isVertical() && !this.isSidebarSecond());
         this._showHideSidebarButton.title = sidebarHidden ? WebInspector.UIString("Show %s", this._showHideSidebarButtonTitle) : WebInspector.UIString("Hide %s", this._showHideSidebarButtonTitle);
     },
 
     __proto__: WebInspector.View.prototype
 }