<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[248004] trunk/Source/WebInspectorUI</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/248004">248004</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-07-29 22:29:59 -0700 (Mon, 29 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Resources: add a "Show Grid" navigation item for the Images collection
https://bugs.webkit.org/show_bug.cgi?id=200260

Reviewed by Joseph Pecoraro.

Each subview `WI.ImageResourceContentView` already listens for changes to the underlying
`WI.settings.showImageGrid` and adds the `.show-grid` class if enabled. As such, this change
just adds a `WI.ButtonNavigationItem` for toggling `WI.settings.showImageGrid` from the
Images "folder".

* UserInterface/Views/ResourceCollectionContentView.js:
(WI.ResourceCollectionContentView):
(WI.ResourceCollectionContentView.prototype.get navigationItems):
(WI.ResourceCollectionContentView.prototype.attached): Added.
(WI.ResourceCollectionContentView.prototype.detached): Added.
(WI.ResourceCollectionContentView.prototype._updateImageTypeScopeBar):
Drive-by: hide the image type `WI.ScopeBar` if there's only one type of image.
(WI.ResourceCollectionContentView.prototype._handleShowGridButtonClicked): Added.
(WI.ResourceCollectionContentView.prototype._handleShowImageGridSettingChanged): Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceCollectionContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceCollectionContentView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (248003 => 248004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-07-30 03:57:01 UTC (rev 248003)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-07-30 05:29:59 UTC (rev 248004)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2019-07-29  Devin Rousso  <drousso@apple.com>
</span><span class="cx"> 
</span><ins>+        Web Inspector: Resources: add a "Show Grid" navigation item for the Images collection
+        https://bugs.webkit.org/show_bug.cgi?id=200260
+
+        Reviewed by Joseph Pecoraro.
+
+        Each subview `WI.ImageResourceContentView` already listens for changes to the underlying
+        `WI.settings.showImageGrid` and adds the `.show-grid` class if enabled. As such, this change
+        just adds a `WI.ButtonNavigationItem` for toggling `WI.settings.showImageGrid` from the
+        Images "folder".
+
+        * UserInterface/Views/ResourceCollectionContentView.js:
+        (WI.ResourceCollectionContentView):
+        (WI.ResourceCollectionContentView.prototype.get navigationItems):
+        (WI.ResourceCollectionContentView.prototype.attached): Added.
+        (WI.ResourceCollectionContentView.prototype.detached): Added.
+        (WI.ResourceCollectionContentView.prototype._updateImageTypeScopeBar):
+        Drive-by: hide the image type `WI.ScopeBar` if there's only one type of image.
+        (WI.ResourceCollectionContentView.prototype._handleShowGridButtonClicked): Added.
+        (WI.ResourceCollectionContentView.prototype._handleShowImageGridSettingChanged): Added.
+
+2019-07-29  Devin Rousso  <drousso@apple.com>
+
</ins><span class="cx">         Web Inspector: add -webkit-* keywords for *-height CSS properties
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=200240
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceCollectionContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceCollectionContentView.js (248003 => 248004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceCollectionContentView.js 2019-07-30 03:57:01 UTC (rev 248003)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceCollectionContentView.js    2019-07-30 05:29:59 UTC (rev 248004)
</span><span class="lines">@@ -36,6 +36,11 @@
</span><span class="cx">         super(collection, contentViewConstructor);
</span><span class="cx"> 
</span><span class="cx">         if (collection.resourceType === WI.Resource.Type.Image) {
</span><ins>+            this._showGridButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-grid", WI.UIString("Show Grid"), WI.UIString("Hide Grid"), "Images/NavigationItemCheckers.svg", 13, 13);
+            this._showGridButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._handleShowGridButtonClicked, this);
+            this._showGridButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
+            this._showGridButtonNavigationItem.activated = !!WI.settings.showImageGrid.value;
+
</ins><span class="cx">             let allItem = new WI.ScopeBarItem("all", WI.UIString("All"));
</span><span class="cx"> 
</span><span class="cx">             let items = [allItem];
</span><span class="lines">@@ -68,14 +73,31 @@
</span><span class="cx"> 
</span><span class="cx">     get navigationItems()
</span><span class="cx">     {
</span><del>-        let navigationItems = super.navigationItems;
</del><ins>+        let navigationItems = [];
</ins><span class="cx">         if (this._imageTypeScopeBar)
</span><del>-            navigationItems.unshift(this._imageTypeScopeBar);
</del><ins>+            navigationItems.push(this._imageTypeScopeBar);
+        if (this._showGridButtonNavigationItem)
+            navigationItems.push(this._showGridButtonNavigationItem);
+        navigationItems = navigationItems.concat(super.navigationItems);
</ins><span class="cx">         return navigationItems;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Protected
</span><span class="cx"> 
</span><ins>+    attached()
+    {
+        super.attached();
+
+        WI.settings.showImageGrid.addEventListener(WI.Setting.Event.Changed, this._handleShowImageGridSettingChanged, this);
+    }
+
+    detached()
+    {
+        WI.settings.showImageGrid.removeEventListener(null, null, this);
+
+        super.detached();
+    }
+
</ins><span class="cx">     contentViewAdded(contentView)
</span><span class="cx">     {
</span><span class="cx">         console.assert(contentView instanceof WI.ResourceContentView);
</span><span class="lines">@@ -99,6 +121,7 @@
</span><span class="cx">     _updateImageTypeScopeBar()
</span><span class="cx">     {
</span><span class="cx">         let extensions = new Set;
</span><ins>+        let visibleExtensions = 0;
</ins><span class="cx"> 
</span><span class="cx">         for (let resource of this.representedObject)
</span><span class="cx">             extensions.add(WI.fileExtensionForMIMEType(resource.mimeType));
</span><span class="lines">@@ -108,9 +131,20 @@
</span><span class="cx">             item.hidden = hidden;
</span><span class="cx">             if (hidden && item.selected)
</span><span class="cx">                 item.selected = false;
</span><ins>+
+            if (!item.hidden)
+                ++visibleExtensions;
</ins><span class="cx">         }
</span><ins>+
+        this._imageTypeScopeBar.hidden = visibleExtensions <= 1;
+        this.dispatchEventToListeners(WI.ContentView.Event.NavigationItemsDidChange);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    _handleShowGridButtonClicked(event)
+    {
+        WI.settings.showImageGrid.value = !this._showGridButtonNavigationItem.activated;
+    }
+
</ins><span class="cx">     _handleImageTypeSelectionChanged()
</span><span class="cx">     {
</span><span class="cx">         let selectedTypes = this._imageTypeScopeBar.selectedItems.map((item) => item.id);
</span><span class="lines">@@ -123,6 +157,12 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    _handleShowImageGridSettingChanged(event)
+    {
+        let activated = WI.settings.showImageGrid.value;
+        this._showGridButtonNavigationItem.activated = activated;
+    }
+
</ins><span class="cx">     _handleContentError(event)
</span><span class="cx">     {
</span><span class="cx">         if (event && event.target)
</span></span></pre>
</div>
</div>

</body>
</html>