<!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>[212695] 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/212695">212695</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2017-02-20 18:32:38 -0800 (Mon, 20 Feb 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: RTL: back/forward navigation buttons should not be flipped
https://bugs.webkit.org/show_bug.cgi?id=168275
&lt;rdar://problem/30506897&gt;

Reviewed by Matt Baker.

The leading button is always &quot;back&quot; and the trailing button is always &quot;forward&quot;, but
in RTL the icons are swapped so that it still looks like '&lt; &gt;' from left-to-right.

Rename the two arrows in the SVG to &quot;left&quot; and &quot;right&quot; arrows, and use them appropriately
in ContentBrowser for back-forward icons based on the layout direction.

* UserInterface/Images/BackForwardArrows.svg:
* UserInterface/Views/ContentBrowser.js:
(WebInspector.ContentBrowser):
* UserInterface/Views/FindBanner.css:
(.find-banner &gt; button.segmented.left &gt; .glyph):
(.find-banner &gt; button.segmented.left:active:not(:disabled) &gt; .glyph):
(.find-banner &gt; button.segmented.right &gt; .glyph):
(.find-banner &gt; button.segmented.right:active:not(:disabled) &gt; .glyph):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesBackForwardArrowssvg">trunk/Source/WebInspectorUI/UserInterface/Images/BackForwardArrows.svg</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss">trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (212694 => 212695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2017-02-21 02:23:39 UTC (rev 212694)
+++ trunk/Source/WebInspectorUI/ChangeLog        2017-02-21 02:32:38 UTC (rev 212695)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-02-20  Brian Burg  &lt;bburg@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Web Inspector: RTL: back/forward navigation buttons should not be flipped
+        https://bugs.webkit.org/show_bug.cgi?id=168275
+        &lt;rdar://problem/30506897&gt;
+
+        Reviewed by Matt Baker.
+
+        The leading button is always &quot;back&quot; and the trailing button is always &quot;forward&quot;, but
+        in RTL the icons are swapped so that it still looks like '&lt; &gt;' from left-to-right.
+
+        Rename the two arrows in the SVG to &quot;left&quot; and &quot;right&quot; arrows, and use them appropriately
+        in ContentBrowser for back-forward icons based on the layout direction.
+
+        * UserInterface/Images/BackForwardArrows.svg:
+        * UserInterface/Views/ContentBrowser.js:
+        (WebInspector.ContentBrowser):
+        * UserInterface/Views/FindBanner.css:
+        (.find-banner &gt; button.segmented.left &gt; .glyph):
+        (.find-banner &gt; button.segmented.left:active:not(:disabled) &gt; .glyph):
+        (.find-banner &gt; button.segmented.right &gt; .glyph):
+        (.find-banner &gt; button.segmented.right:active:not(:disabled) &gt; .glyph):
+
+2017-02-20  Brian Burg  &lt;bburg@apple.com&gt;
+
</ins><span class="cx">         Web Inspector: RTL: hierarchical path components need spacing and icon adjustments
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=168581
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesBackForwardArrowssvg"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Images/BackForwardArrows.svg (212694 => 212695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/BackForwardArrows.svg        2017-02-21 02:23:39 UTC (rev 212694)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/BackForwardArrows.svg        2017-02-21 02:32:38 UTC (rev 212695)
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">     &lt;/style&gt;
</span><span class="cx"> 
</span><span class="cx">     &lt;defs&gt;
</span><del>-        &lt;symbol id=&quot;back-arrow-symbol&quot; viewBox=&quot;0 0 10 16&quot;&gt;&lt;path fill=&quot;inherit&quot; d=&quot;M 3.20540064 7.75983283 L 9.3448 1.6244 L 7.7388 0.0174 L -0.0002 7.7514 L 0.0091993759 7.76080523 L 0.0018 7.7682 L 7.7358 15.5072 L 9.3428 13.9012 L 3.20540064 7.75983283 Z&quot;/&gt;&lt;/symbol&gt;
-        &lt;symbol id=&quot;forward-arrow-symbol&quot; viewBox=&quot;0 0 10 16&quot;&gt;&lt;path fill=&quot;inherit&quot; d=&quot;M 6.13924933 7.75978283 L 0.0018 13.9012 L 1.6088 15.5072 L 9.3428 7.7682 L 9.33545066 7.76085523 L 9.3449 7.7514 L 1.6059 0.0174 L -0.0001 1.6244 L 6.13924933 7.75978283 Z&quot;/&gt;&lt;/symbol&gt;
</del><ins>+        &lt;symbol id=&quot;left-arrow-symbol&quot; viewBox=&quot;0 0 10 16&quot;&gt;&lt;path fill=&quot;inherit&quot; d=&quot;M 3.20540064 7.75983283 L 9.3448 1.6244 L 7.7388 0.0174 L -0.0002 7.7514 L 0.0091993759 7.76080523 L 0.0018 7.7682 L 7.7358 15.5072 L 9.3428 13.9012 L 3.20540064 7.75983283 Z&quot;/&gt;&lt;/symbol&gt;
+        &lt;symbol id=&quot;right-arrow-symbol&quot; viewBox=&quot;0 0 10 16&quot;&gt;&lt;path fill=&quot;inherit&quot; d=&quot;M 6.13924933 7.75978283 L 0.0018 13.9012 L 1.6088 15.5072 L 9.3428 7.7682 L 9.33545066 7.76085523 L 9.3449 7.7514 L 1.6059 0.0174 L -0.0001 1.6244 L 6.13924933 7.75978283 Z&quot;/&gt;&lt;/symbol&gt;
</ins><span class="cx">     &lt;/defs&gt;
</span><span class="cx"> 
</span><del>-    &lt;svg id=&quot;back-arrow-mask&quot;&gt;&lt;use fill=&quot;currentColor&quot; xlink:href=&quot;#back-arrow-symbol&quot;/&gt;&lt;/svg&gt;
-    &lt;svg id=&quot;back-arrow-normal&quot;&gt;&lt;use xlink:href=&quot;#back-arrow-symbol&quot;/&gt;&lt;/svg&gt;
-    &lt;svg id=&quot;back-arrow-active&quot;&gt;&lt;use xlink:href=&quot;#back-arrow-symbol&quot;/&gt;&lt;/svg&gt;
</del><ins>+    &lt;svg id=&quot;left-arrow-mask&quot;&gt;&lt;use fill=&quot;currentColor&quot; xlink:href=&quot;#left-arrow-symbol&quot;/&gt;&lt;/svg&gt;
+    &lt;svg id=&quot;left-arrow-normal&quot;&gt;&lt;use xlink:href=&quot;#left-arrow-symbol&quot;/&gt;&lt;/svg&gt;
+    &lt;svg id=&quot;left-arrow-active&quot;&gt;&lt;use xlink:href=&quot;#left-arrow-symbol&quot;/&gt;&lt;/svg&gt;
</ins><span class="cx"> 
</span><del>-    &lt;svg id=&quot;forward-arrow-mask&quot;&gt;&lt;use fill=&quot;currentColor&quot; xlink:href=&quot;#forward-arrow-symbol&quot;/&gt;&lt;/svg&gt;
-    &lt;svg id=&quot;forward-arrow-normal&quot;&gt;&lt;use xlink:href=&quot;#forward-arrow-symbol&quot;/&gt;&lt;/svg&gt;
-    &lt;svg id=&quot;forward-arrow-active&quot;&gt;&lt;use xlink:href=&quot;#forward-arrow-symbol&quot;/&gt;&lt;/svg&gt;
</del><ins>+    &lt;svg id=&quot;right-arrow-mask&quot;&gt;&lt;use fill=&quot;currentColor&quot; xlink:href=&quot;#right-arrow-symbol&quot;/&gt;&lt;/svg&gt;
+    &lt;svg id=&quot;right-arrow-normal&quot;&gt;&lt;use xlink:href=&quot;#right-arrow-symbol&quot;/&gt;&lt;/svg&gt;
+    &lt;svg id=&quot;right-arrow-active&quot;&gt;&lt;use xlink:href=&quot;#right-arrow-symbol&quot;/&gt;&lt;/svg&gt;
</ins><span class="cx"> &lt;/svg&gt;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js (212694 => 212695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js        2017-02-21 02:23:39 UTC (rev 212694)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowser.js        2017-02-21 02:32:38 UTC (rev 212695)
</span><span class="lines">@@ -42,12 +42,17 @@
</span><span class="cx">             this._backKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Left, this._backButtonClicked.bind(this), this.element);
</span><span class="cx">             this._forwardKeyboardShortcut = new WebInspector.KeyboardShortcut(WebInspector.KeyboardShortcut.Modifier.CommandOrControl | WebInspector.KeyboardShortcut.Modifier.Control, WebInspector.KeyboardShortcut.Key.Right, this._forwardButtonClicked.bind(this), this.element);
</span><span class="cx"> 
</span><del>-            this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem(&quot;back&quot;, WebInspector.UIString(&quot;Back (%s)&quot;).format(this._backKeyboardShortcut.displayName), &quot;Images/BackForwardArrows.svg#back-arrow-mask&quot;, 8, 13);
</del><ins>+            let leftArrow = &quot;Images/BackForwardArrows.svg#left-arrow-mask&quot;;
+            let rightArrow = &quot;Images/BackForwardArrows.svg#right-arrow-mask&quot;;
+            let backButtonImage = WebInspector.resolvedLayoutDirection() === WebInspector.LayoutDirection.RTL ? rightArrow : leftArrow;
+            let forwardButtonImage = WebInspector.resolvedLayoutDirection() === WebInspector.LayoutDirection.RTL ? leftArrow : rightArrow;
+
+            this._backButtonNavigationItem = new WebInspector.ButtonNavigationItem(&quot;back&quot;, WebInspector.UIString(&quot;Back (%s)&quot;).format(this._backKeyboardShortcut.displayName), backButtonImage, 8, 13);
</ins><span class="cx">             this._backButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._backButtonClicked, this);
</span><span class="cx">             this._backButtonNavigationItem.enabled = false;
</span><span class="cx">             this._navigationBar.addNavigationItem(this._backButtonNavigationItem);
</span><span class="cx"> 
</span><del>-            this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem(&quot;forward&quot;, WebInspector.UIString(&quot;Forward (%s)&quot;).format(this._forwardKeyboardShortcut.displayName), &quot;Images/BackForwardArrows.svg#forward-arrow-mask&quot;, 8, 13);
</del><ins>+            this._forwardButtonNavigationItem = new WebInspector.ButtonNavigationItem(&quot;forward&quot;, WebInspector.UIString(&quot;Forward (%s)&quot;).format(this._forwardKeyboardShortcut.displayName), forwardButtonImage, 8, 13);
</ins><span class="cx">             this._forwardButtonNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._forwardButtonClicked, this);
</span><span class="cx">             this._forwardButtonNavigationItem.enabled = false;
</span><span class="cx">             this._navigationBar.addNavigationItem(this._forwardButtonNavigationItem);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsFindBannercss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css (212694 => 212695)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css        2017-02-21 02:23:39 UTC (rev 212694)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/FindBanner.css        2017-02-21 02:32:38 UTC (rev 212695)
</span><span class="lines">@@ -160,11 +160,11 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented.left &gt; .glyph {
</span><del>-    background-image: url(../Images/BackForwardArrows.svg#back-arrow-normal);
</del><ins>+    background-image: url(../Images/BackForwardArrows.svg#left-arrow-normal);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented.left:active:not(:disabled) &gt; .glyph {
</span><del>-    background-image: url(../Images/BackForwardArrows.svg#back-arrow-active);
</del><ins>+    background-image: url(../Images/BackForwardArrows.svg#left-arrow-active);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented.right {
</span><span class="lines">@@ -175,12 +175,12 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented.right &gt; .glyph {
</span><del>-    background-image: url(../Images/BackForwardArrows.svg#forward-arrow-normal);
</del><ins>+    background-image: url(../Images/BackForwardArrows.svg#right-arrow-normal);
</ins><span class="cx">     margin-left: 1px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented.right:active:not(:disabled) &gt; .glyph {
</span><del>-    background-image: url(../Images/BackForwardArrows.svg#forward-arrow-active);
</del><ins>+    background-image: url(../Images/BackForwardArrows.svg#right-arrow-active);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> .find-banner &gt; button.segmented {
</span></span></pre>
</div>
</div>

</body>
</html>