Title: [212910] trunk/Source/WebInspectorUI
Revision
212910
Author
[email protected]
Date
2017-02-23 11:55:10 -0800 (Thu, 23 Feb 2017)

Log Message

Web Inspector: RTL: navigation sidebar section disclosure triangles and tree element icons should be aligned right
https://bugs.webkit.org/show_bug.cgi?id=168284

Patch by Devin Rousso <[email protected]> on 2017-02-23
Reviewed by Brian Burg.

* UserInterface/Views/TreeOutline.css:
(.tree-outline,):
(.tree-outline.large .item):
(body[dir=ltr] .tree-outline .item :matches(.disclosure-button, .icon)):
(body[dir=rtl] .tree-outline .item :matches(.disclosure-button, .icon)):
(body[dir=ltr] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon):
(body[dir=rtl] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon):
(.tree-outline .item .disclosure-button):
(body[dir=rtl] .tree-outline .item .disclosure-button):
(.tree-outline .item .icon):
(body[dir=ltr] .tree-outline .item .icon):
(body[dir=rtl] .tree-outline .item .icon):
(.tree-outline.large .item .icon):
(.tree-outline .item .status):
(body[dir=ltr] .tree-outline .item .status):
(body[dir=rtl] .tree-outline .item .status):
(.tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon): Deleted.

* UserInterface/Views/TreeOutline.js:
(WebInspector.TreeOutline._generateStyleRulesIfNeeded):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (212909 => 212910)


--- trunk/Source/WebInspectorUI/ChangeLog	2017-02-23 19:47:32 UTC (rev 212909)
+++ trunk/Source/WebInspectorUI/ChangeLog	2017-02-23 19:55:10 UTC (rev 212910)
@@ -1,3 +1,31 @@
+2017-02-23  Devin Rousso  <[email protected]>
+
+        Web Inspector: RTL: navigation sidebar section disclosure triangles and tree element icons should be aligned right
+        https://bugs.webkit.org/show_bug.cgi?id=168284
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/TreeOutline.css:
+        (.tree-outline,):
+        (.tree-outline.large .item):
+        (body[dir=ltr] .tree-outline .item :matches(.disclosure-button, .icon)):
+        (body[dir=rtl] .tree-outline .item :matches(.disclosure-button, .icon)):
+        (body[dir=ltr] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon):
+        (body[dir=rtl] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon):
+        (.tree-outline .item .disclosure-button):
+        (body[dir=rtl] .tree-outline .item .disclosure-button):
+        (.tree-outline .item .icon):
+        (body[dir=ltr] .tree-outline .item .icon):
+        (body[dir=rtl] .tree-outline .item .icon):
+        (.tree-outline.large .item .icon):
+        (.tree-outline .item .status):
+        (body[dir=ltr] .tree-outline .item .status):
+        (body[dir=rtl] .tree-outline .item .status):
+        (.tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon): Deleted.
+
+        * UserInterface/Views/TreeOutline.js:
+        (WebInspector.TreeOutline._generateStyleRulesIfNeeded):
+
 2017-02-22  Devin Rousso  <[email protected]>
 
         Web Inspector: RTL: Sidebar borders are on the wrong side

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css (212909 => 212910)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css	2017-02-23 19:47:32 UTC (rev 212909)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.css	2017-02-23 19:55:10 UTC (rev 212910)
@@ -25,12 +25,15 @@
 
 .tree-outline,
 .tree-outline .children {
+    margin: 0;
     padding: 0;
-    margin: 0;
-
+    list-style: none;
     outline: none;
 
-    list-style: none;
+    --tree-outline-icon-margin-start: 16px;
+    --tree-outline-icon-margin-end: 3px;
+
+    --tree-outline-status-margin-start: 4px;
 }
 
 .tree-outline .children {
@@ -58,8 +61,18 @@
 .tree-outline.large .item {
     height: 36px;
     line-height: 34px;
+
+    --tree-outline-icon-margin-end: 6px;
 }
 
+body[dir=ltr] .tree-outline .item :matches(.disclosure-button, .icon) {
+    float: left;
+}
+
+body[dir=rtl] .tree-outline .item :matches(.disclosure-button, .icon) {
+    float: right;
+}
+
 .tree-outline.hide-disclosure-buttons > .children {
     display: none;
 }
@@ -68,29 +81,31 @@
     display: none;
 }
 
-.tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon {
-    margin-left: 16px;
+body[dir=ltr] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon {
+    margin-left: var(--tree-outline-icon-margin-start);
 }
 
+body[dir=rtl] .tree-outline:not(.hide-disclosure-buttons) .item:not(.parent) > .icon {
+    margin-right: var(--tree-outline-icon-margin-start);
+}
+
 .tree-outline .item .disclosure-button {
     display: none;
-
-    float: left;
-
     width: 16px;
     height: 16px;
-
-    border: 0;
-
     background-color: transparent;
     background-image: url(../Images/DisclosureTriangles.svg#closed-normal);
     background-repeat: no-repeat;
     background-position: center;
     background-size: 13px 13px;
-
+    border: none;
     -webkit-appearance: none;
 }
 
+body[dir=rtl] .tree-outline .item .disclosure-button {
+    transform: scaleX(-1);
+}
+
 .tree-outline.hide-disclosure-buttons .item .disclosure-button {
     display: none;
 }
@@ -112,37 +127,45 @@
 }
 
 .tree-outline .item .icon {
-    float: left;
     position: relative;
-
     width: 16px;
     height: 16px;
-
     margin-top: 1px;
-    margin-right: 3px;
 }
 
+body[dir=ltr] .tree-outline .item .icon {
+    margin-right: var(--tree-outline-icon-margin-end);
+}
+
+body[dir=rtl] .tree-outline .item .icon {
+    margin-left: var(--tree-outline-icon-margin-end);
+}
+
 .tree-outline.compact .item .icon {
     margin-top: 0;
 }
 
 .tree-outline.large .item .icon {
-    margin-top: 5px;
-    margin-right: 6px;
-
     width: 24px;
     height: 24px;
+    margin-top: 5px;
 }
 
 .tree-outline .item .status {
-    float: right;
-
-    margin-left: 4px;
     margin-top: 1px;
-
     line-height: 1em;
 }
 
+body[dir=ltr] .tree-outline .item .status {
+    float: right;
+    margin-left: var(--tree-outline-status-margin-start);
+}
+
+body[dir=rtl] .tree-outline .item .status {
+    float: left;
+    margin-right: var(--tree-outline-status-margin-start);
+}
+
 .tree-outline.large .item .status {
     margin-top: 9px;
 }

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js (212909 => 212910)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2017-02-23 19:47:32 UTC (rev 212909)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TreeOutline.js	2017-02-23 19:55:10 UTC (rev 212910)
@@ -651,7 +651,13 @@
             // Keep all the elements at the same depth once the maximum is reached.
             childrenSubstring += i === maximumTreeDepth ? " .children" : " > .children";
             styleText += `.${WebInspector.TreeOutline.ElementStyleClassName}:not(.${WebInspector.TreeOutline.CustomIndentStyleClassName})${childrenSubstring} > .item { `;
-            styleText += "padding-left: " + (baseLeftPadding + (depthPadding * i)) + "px; }\n";
+
+            if (WebInspector.resolvedLayoutDirection() === WebInspector.LayoutDirection.RTL)
+                styleText += "padding-right: ";
+            else
+                styleText += "padding-left: ";
+
+            styleText += (baseLeftPadding + (depthPadding * i)) + "px; }\n";
         }
 
         WebInspector.TreeOutline._styleElement.textContent = styleText;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to