From 91727ef506fd9f5fe2a88887de1ad0528bae6d01 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Wed, 16 Apr 2003 10:01:07 +0000
Subject: [PATCH] Bug 200127 Standardize on <tree class="focusring"> r=varga
 sr=jag r=rginda (venkman)

---
 extensions/venkman/resources/content/tree-utils.js    |  6 ------
 .../venkman/resources/content/venkman-views.xul       | 10 +++++++++-
 extensions/venkman/resources/skin/venkman.css         |  8 --------
 mailnews/base/resources/content/folderPane.xul        |  2 +-
 mailnews/base/resources/content/threadPane.xul        |  2 +-
 themes/classic/global/mac/tree.css                    | 10 ++++++++++
 themes/classic/global/win/filepicker.css              | 10 ----------
 themes/classic/global/win/tree.css                    | 10 ++++++++++
 themes/classic/messenger/mailWindow1.css              | 10 ----------
 themes/modern/global/filepicker.css                   | 11 -----------
 themes/modern/global/tree.css                         | 10 ++++++++++
 themes/modern/messenger/mailWindow1.css               | 10 ----------
 xpfe/components/filepicker/res/content/filepicker.xul |  2 +-
 xpfe/global/resources/content/config.css              | 10 ----------
 xpfe/global/resources/content/config.xul              |  2 +-
 15 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/extensions/venkman/resources/content/tree-utils.js b/extensions/venkman/resources/content/tree-utils.js
index 7e1a919840b6..1a9b81750f30 100644
--- a/extensions/venkman/resources/content/tree-utils.js
+++ b/extensions/venkman/resources/content/tree-utils.js
@@ -1504,9 +1504,6 @@ function xtv_pactcell (action)
 XULTreeView.prototype.onRouteFocus =
 function xtv_rfocus (event)
 {
-    if (this.tree && this.tree.treeBody)
-        this.tree.treeBody.setAttribute("focused", true)
-
     if ("onFocus" in this)
         this.onFocus(event);
 }
@@ -1514,9 +1511,6 @@ function xtv_rfocus (event)
 XULTreeView.prototype.onRouteBlur =
 function xtv_rblur (event)
 {
-    if (this.tree && this.tree.treeBody)
-        this.tree.treeBody.removeAttribute("focused");
-
     if ("onBlur" in this)
         this.onBlur(event);
 }
diff --git a/extensions/venkman/resources/content/venkman-views.xul b/extensions/venkman/resources/content/venkman-views.xul
index 08163477d984..55d3dc5b4204 100644
--- a/extensions/venkman/resources/content/venkman-views.xul
+++ b/extensions/venkman/resources/content/venkman-views.xul
@@ -49,6 +49,7 @@
     <floatingview id="breaks" title="&Break.label;" flex="1">
       <vbox id="break-view-content" flex="1">
         <tree flex="1" id="break-tree" persist="height" hidecolumnpicker="true"
+          class="focusring"
           context="context:breaks">
 
           <treecols>
@@ -71,6 +72,7 @@
     <floatingview id="locals" title="&Locals.label;" flex="1">
       <vbox id="locals-view-content" flex="1">
         <tree flex="1" id="locals-tree" persist="height"
+          class="focusring"
           context="context:locals">
 
           <treecols>
@@ -117,6 +119,7 @@
             oninput="console.views.scripts.onSearchInput(event);"/>
         </hbox>
         <tree flex="1" id="scripts-tree" persist="height"
+          class="focusring"
           context="context:scripts">
 
           <treecols>
@@ -163,6 +166,7 @@
           </toolbar>
         </toolbox>
         <tree id="source-tree" flex="1" persist="width"
+          class="focusring"
           onclick="console.views.source.onClick(event);"
           onselect="console.views.source.onSelect(event);"
           context="context:source">
@@ -189,7 +193,9 @@
     <floatingview id="stack" title="&Stack.label;" flex="1"
       grippytooltiptext="&Stack.label;">
       <vbox id="stack-view-content" flex="1">
-        <tree flex="2" id="stack-tree" persist="width" context="context:stack">
+        <tree flex="2" id="stack-tree" persist="width"
+          class="focusring"
+          context="context:stack">
 
           <treecols>
             <treecol id="stack:col-0" flex="1" persist="hidden width"
@@ -211,6 +217,7 @@
     <floatingview id="watches" title="&Watch.label;" flex="1">
       <vbox id="watch-view-content" flex="1">
         <tree flex="1" id="watch-tree" persist="height"
+          class="focusring"
           context="context:watches">
 
           <treecols>
@@ -238,6 +245,7 @@
     <floatingview id="windows" title="&Windows.label;" flex="1">
       <vbox id="windows-view-content" flex="1">
         <tree flex="1" id="windows-tree" persist="height"
+          class="focusring"
           context="context:windows"
           hidecolumnpicker="true">
 
diff --git a/extensions/venkman/resources/skin/venkman.css b/extensions/venkman/resources/skin/venkman.css
index 798ad61896b1..4a1aa7f5d972 100644
--- a/extensions/venkman/resources/skin/venkman.css
+++ b/extensions/venkman/resources/skin/venkman.css
@@ -68,14 +68,6 @@ tree {
     margin: 0px;
 }
 
-treechildren {
-    border: 1px white solid;
-}
-
-treechildren[focused] {
-    border: 1px black solid;
-}
-
 tabpanels {
     background: none;
     padding: 2px;
diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index 280507d19a91..205c04fb047f 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -33,7 +33,7 @@
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <tree id="folderTree" class="plain" flex="1" seltype="single" 
+  <tree id="folderTree" class="plain focusring" flex="1" seltype="single"
             disableKeyNavigation="true"
             datasources="rdf:null"
             statedatasource="rdf:mailnewsfolders"
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index 83a1840cb46a..639339b89ff7 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -35,7 +35,7 @@ Contributors:
 
 <script src="chrome://messenger/content/threadPane.js"/>
 
-<tree id="threadTree" flex="1" enableColumnDrag="true" _selectDelay="500" class="plain" disableKeyNavigation="true"
+<tree id="threadTree" flex="1" enableColumnDrag="true" _selectDelay="500" class="plain focusring" disableKeyNavigation="true"
     onkeypress="ThreadPaneKeyPress(event);"
     onselect="ThreadPaneSelectionChanged();">
   <treecols pickertooltiptext="&columnChooser.tooltip;">
diff --git a/themes/classic/global/mac/tree.css b/themes/classic/global/mac/tree.css
index 4ea7852b3ce1..33171ae69d44 100644
--- a/themes/classic/global/mac/tree.css
+++ b/themes/classic/global/mac/tree.css
@@ -41,6 +41,16 @@ tree {
   color: -moz-DialogText;
 }
 
+/* ::::: tree focusring ::::: */
+
+.focusring > .tree-rows > .tree-bodybox {
+  border: 2px solid transparent;  
+}
+
+.focusring:focus > .tree-rows > .tree-bodybox {
+  border: 2px solid -moz-mac-focusring;
+}
+
 /* ::::: tree rows ::::: */
 
 tree[selstyle="primary"] > treechildren:-moz-tree-row,
diff --git a/themes/classic/global/win/filepicker.css b/themes/classic/global/win/filepicker.css
index 3534b298c5bc..0d1313cce793 100644
--- a/themes/classic/global/win/filepicker.css
+++ b/themes/classic/global/win/filepicker.css
@@ -48,16 +48,6 @@ treechildren:-moz-tree-image(FilenameColumn, file) {
   list-style-image: url("chrome://global/skin/filepicker/blank.gif");
 }
 
-/* ::::: focus rules ::::: */
-
-#directoryTree > treerows > .tree-bodybox {
-  border: 1px solid transparent;
-} 
-
-#directoryTree:focus > treerows > .tree-bodybox {
-  border-color: #000000;
-} 
-
 /* ::::: button items ::::: */
 
 .up-button {
diff --git a/themes/classic/global/win/tree.css b/themes/classic/global/win/tree.css
index 2ea17324098f..6944c49da7ea 100644
--- a/themes/classic/global/win/tree.css
+++ b/themes/classic/global/win/tree.css
@@ -42,6 +42,16 @@ tree {
   -moz-appearance: listbox;
 }
 
+/* ::::: tree focusring ::::: */
+
+.focusring > .tree-rows > .tree-bodybox {
+  border: 1px solid transparent;  
+}
+
+.focusring:focus > .tree-rows > .tree-bodybox {
+  border: 1px solid #000000;
+}
+
 /* ::::: tree rows ::::: */
 
 tree[selstyle="primary"] > treechildren:-moz-tree-row,
diff --git a/themes/classic/messenger/mailWindow1.css b/themes/classic/messenger/mailWindow1.css
index 9be582bc6842..ec72f6dac655 100644
--- a/themes/classic/messenger/mailWindow1.css
+++ b/themes/classic/messenger/mailWindow1.css
@@ -87,16 +87,6 @@
   border-bottom: 1px solid ThreeDShadow;
 }
 
-#folderTree > .tree-rows > .tree-bodybox,
-#threadTree > .tree-rows > .tree-bodybox {
-  border: 1px solid transparent;  
-}
-
-#folderTree:focus > .tree-rows > .tree-bodybox,
-#threadTree:focus > .tree-rows > .tree-bodybox {
-  border: 1px solid #000000;
-}
-
 /* ..... message pane adjustments ..... */
 
 #messagepanebox {
diff --git a/themes/modern/global/filepicker.css b/themes/modern/global/filepicker.css
index ead0e692ebf4..3c2e45921df0 100644
--- a/themes/modern/global/filepicker.css
+++ b/themes/modern/global/filepicker.css
@@ -66,17 +66,6 @@ treechildren:-moz-tree-image(FilenameColumn, file) {
   list-style-image: url("chrome://global/skin/filepicker/blank.gif");
 }
 
-
-/* ::::: focus rules ::::: */
-
-#directoryTree > treerows > .tree-bodybox {
-  border: 1px solid transparent;
-} 
-
-#directoryTree:focus > treerows > .tree-bodybox {
-  border-color: #000000;
-}
-
 /* ::::: button items ::::: */
 
 .up-button {
diff --git a/themes/modern/global/tree.css b/themes/modern/global/tree.css
index 95b629821876..d3a79764751a 100644
--- a/themes/modern/global/tree.css
+++ b/themes/modern/global/tree.css
@@ -54,6 +54,16 @@ tree {
   color: #000000;
 }
 
+/* ::::: tree focusring ::::: */
+
+.focusring > .tree-rows > .tree-bodybox {
+  border: 1px solid transparent;  
+}
+
+.focusring:focus > .tree-rows > .tree-bodybox {
+  border: 1px solid #000000;
+}
+
 /* ::::: tree rows ::::: */
 
 tree[selstyle="primary"] > treechildren:-moz-tree-row,
diff --git a/themes/modern/messenger/mailWindow1.css b/themes/modern/messenger/mailWindow1.css
index e43abb090ac8..ae495a254b9b 100644
--- a/themes/modern/messenger/mailWindow1.css
+++ b/themes/modern/messenger/mailWindow1.css
@@ -102,16 +102,6 @@
   -moz-border-bottom-colors: #5D616E #BEC3D3;
 }
 
-#folderTree > .tree-rows > .tree-bodybox,
-#threadTree > .tree-rows > .tree-bodybox {
-  border: 1px solid transparent;  
-}
-
-#folderTree:focus > .tree-rows > .tree-bodybox,
-#threadTree:focus > .tree-rows > .tree-bodybox {
-  border: 1px solid #000000;
-}
-
 /* ..... message pane adjustments ..... */
 
 #messagepanebox {
diff --git a/xpfe/components/filepicker/res/content/filepicker.xul b/xpfe/components/filepicker/res/content/filepicker.xul
index 83cf2e757790..4f17b32260ae 100644
--- a/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/xpfe/components/filepicker/res/content/filepicker.xul
@@ -55,7 +55,7 @@
 
 <hbox flex="1">
   <deck id="errorShower" flex="1">
-    <tree id="directoryTree" flex="1" seltype="single"
+    <tree id="directoryTree" flex="1" class="focusring" seltype="single"
               onclick="onClick(event);"
               ondblclick="onDblClick(event);"
               onkeypress="onKeypress(event);"
diff --git a/xpfe/global/resources/content/config.css b/xpfe/global/resources/content/config.css
index 9a957aca3d84..68307b919ddf 100644
--- a/xpfe/global/resources/content/config.css
+++ b/xpfe/global/resources/content/config.css
@@ -30,16 +30,6 @@
 
 /* ::::: tree rows ::::: */
 
-tree:focus > .tree-bodybox
-{
-  border: 1px solid black;
-}
-
-tree > .tree-bodybox
-{
-  border: 1px solid transparent;
-}
-
 treechildren:-moz-tree-cell-text(user)
 {
   font-weight: bold;
diff --git a/xpfe/global/resources/content/config.xul b/xpfe/global/resources/content/config.xul
index 73ff22a40a11..773f67e51516 100644
--- a/xpfe/global/resources/content/config.xul
+++ b/xpfe/global/resources/content/config.xul
@@ -54,7 +54,7 @@ Neil Rashbrook <neil@parkwaycc.co.uk>
   <menuitem label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
 </popup>
 
-<tree id="configTree" flex="1" class="plain" seltype="single"
+<tree id="configTree" flex="1" class="plain focusring" seltype="single"
       enableColumnDrag="true" context="configContext">
   <treecols>
     <treecol id="prefCol" label="&prefColumn.label;" flex="7"