Changeset 223147 in webkit

Timestamp:

Oct 10, 2017 2:40:31 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Network Tab - Set column initial widths to try allow waterfall column to expand more by default
​https://bugs.webkit.org/show_bug.cgi?id=178142
<rdar://problem/34918233>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2017-10-10
Reviewed by Brian Burg.

• UserInterface/Views/NetworkTableContentView.js:

(WI.NetworkTableContentView.prototype.initialLayout):
Provide initial widths for many columns where the max could fit
but we'd prefer a smaller than max initial width in wide cases.

• UserInterface/Views/Table.js:

(WI.Table.prototype._resizeColumnsAndFiller):
When auto sizing all columns use the preferred initial widths.

• UserInterface/Views/TableColumn.js:

(WI.TableColumn.prototype.get preferredInitialWidth):
Save the initial width.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (12 diffs)
• UserInterface/Views/Table.js (modified) (1 diff)
• UserInterface/Views/TableColumn.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Network Tab - Set column initial widths to try allow waterfall column to expand more by default
+        https://bugs.webkit.org/show_bug.cgi?id=178142
+        <rdar://problem/34918233>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/NetworkTableContentView.js:
+        (WI.NetworkTableContentView.prototype.initialLayout):
+        Provide initial widths for many columns where the max could fit
+        but we'd prefer a smaller than max initial width in wide cases.
+
+        * UserInterface/Views/Table.js:
+        (WI.Table.prototype._resizeColumnsAndFiller):
+        When auto sizing all columns use the preferred initial widths.
+
+        * UserInterface/Views/TableColumn.js:
+        (WI.TableColumn.prototype.get preferredInitialWidth):
+        Save the initial width.
+
 2017-10-10  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

@@ -478 +478 @@
     {
         this._nameColumn = new WI.TableColumn("name", WI.UIString("Name"), {
-            initialWidth: this._nameColumnWidthSetting.value,
             minWidth: WI.Sidebar.AbsoluteMinimumWidth,
             maxWidth: 500,
+            initialWidth: this._nameColumnWidthSetting.value,
             resizeType: WI.TableColumn.ResizeType.Locked,
         });
@@ -489 +489 @@
             minWidth: 120,
             maxWidth: 200,
+            initialWidth: 150,
         });
 
@@ -494 +495 @@
             minWidth: 70,
             maxWidth: 120,
+            initialWidth: 90,
         });
 
@@ -500 +502 @@
             minWidth: 100,
             maxWidth: 150,
+            initialWidth: 120,
         });
 
@@ -506 +509 @@
             minWidth: 55,
             maxWidth: 80,
+            initialWidth: 65,
         });
 
@@ -512 +516 @@
             minWidth: 55,
             maxWidth: 80,
+            initialWidth: 65,
         });
 
@@ -525 +530 @@
             minWidth: 65,
             maxWidth: 80,
+            initialWidth: 75,
         });
 
@@ -531 +537 @@
             minWidth: 65,
             maxWidth: 80,
+            initialWidth: 70,
         });
 
@@ -542 +549 @@
             minWidth: 50,
             maxWidth: 120,
+            initialWidth: 80,
             align: "right",
         });
@@ -549 +557 @@
             minWidth: 80,
             maxWidth: 100,
+            initialWidth: 80,
             align: "right",
         });
@@ -555 +564 @@
             minWidth: 100,
             maxWidth: 150,
+            initialWidth: 100,
             align: "right",
         });
@@ -561 +571 @@
             minWidth: 65,
             maxWidth: 90,
+            initialWidth: 65,
             align: "right",
         });

trunk/Source/WebInspectorUI/UserInterface/Views/Table.js

@@ -821 +821 @@
             }
 
+            // Best fit with the preferred initial width for flexible columns.
+            bestFit.call(this, (column, width) => {
+                if (!column.preferredInitialWidth || width <= column.preferredInitialWidth)
+                    return -1;
+                return column.preferredInitialWidth;
+            });
+
             // Best fit max size flexible columns. May make more pixels available for other columns.
             bestFit.call(this, (column, width) => {

trunk/Source/WebInspectorUI/UserInterface/Views/TableColumn.js

@@ -42 +42 @@
         this._minWidth = minWidth || 50;
         this._maxWidth = maxWidth || 0;
+        this._initialWidth = initialWidth || NaN;
         this._hidden = hidden || false;
         this._defaultHidden = hidden || false;
@@ -60 +61 @@
     get minWidth() { return this._minWidth; }
     get maxWidth() { return this._maxWidth; }
+    get preferredInitialWidth() { return this._initialWidth; }
     get defaultHidden() { return this._defaultHidden; }
     get sortable() { return this._sortable; }