Bug 80837 Twisties and thread lines should not be selected with rows r=varga sr=jag

themes/classic/global/mac/tree.css

@@ -43,9 +43,11 @@ tree {
 
 /* ::::: tree rows ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-row,
 treechildren:-moz-tree-row {
   -moz-appearance: treeitem;
   border-top: 1px solid -moz-Field;
+  background-color: transparent;
   min-height: 18px;
   height: 1.3em;
 }
@@ -64,6 +66,7 @@ treechildren:-moz-tree-cell {
   padding: 0px 2px 0px 2px;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text,
 treechildren:-moz-tree-cell-text {
   color: inherit;
 }
@@ -72,10 +75,20 @@ treechildren:-moz-tree-cell-text(selected) {
   color: -moz-DialogText;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected) {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
 treechildren:-moz-tree-cell-text(selected, focus) {
   color: HighlightText;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, focus) {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
 
 /* ::::: lines connecting cells ::::: */
 
@@ -99,6 +112,7 @@ treechildren:-moz-tree-separator {
 
 /* ::::: drop feedback ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, dropOn),
 treechildren:-moz-tree-cell-text(primary, dropOn) {
   background-color: Highlight;
   color: HighlightText;
@@ -260,4 +274,4 @@ treechildren.gridlines:-moz-tree-cell {
 
 treechildren.gridlines:-moz-tree-row {
   border: none;
-}
+}

themes/classic/global/win/tree.css

@@ -44,8 +44,10 @@ tree {
 
 /* ::::: tree rows ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-row,
 treechildren:-moz-tree-row {
   border: 1px solid transparent;
+  background-color: transparent;
   min-height: 18px;
   height: 1.3em;
 }
@@ -72,7 +74,9 @@ treechildren:-moz-tree-cell {
   padding: 0px 2px 0px 2px;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text,
 treechildren:-moz-tree-cell-text {
+  border: 1px solid transparent;
   color: inherit;
 }
 
@@ -80,13 +84,32 @@ treechildren:-moz-tree-cell-text(selected) {
   color: -moz-DialogText;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected) {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+}
+
 treechildren:-moz-tree-cell-text(selected, focus) {
   color: HighlightText;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, focus) {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, current, focus) {
+  border: 1px dotted #000000;
+}
+
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, current, focus) {
+  border: 1px dotted #C0C0C0;
+}
+
 
 /* ::::: lines connecting cells ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-line,
 treechildren:-moz-tree-line {
   border: 1px dotted ThreeDShadow;
 }
@@ -106,6 +129,7 @@ treechildren:-moz-tree-separator {
 
 /* ::::: drop feedback ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, dropOn),
 treechildren:-moz-tree-cell-text(primary, dropOn) {
   background-color: Highlight;
   color: HighlightText;
@@ -262,4 +286,4 @@ treechildren.gridlines:-moz-tree-cell {
 
 treechildren.gridlines:-moz-tree-row {
   border: none;
-}
+}

themes/modern/global/tree.css

@@ -56,8 +56,10 @@ tree {
 
 /* ::::: tree rows ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-row,
 treechildren:-moz-tree-row {
   border: 1px solid transparent;
+  background-color: transparent;
   min-height: 18px;
   height: 1.3em;
 }
@@ -81,7 +83,9 @@ treechildren:-moz-tree-cell {
   padding: 0px 2px 0px 2px;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text,
 treechildren:-moz-tree-cell-text {
+  border: 1px solid transparent;
   color: inherit;
 }
 
@@ -89,12 +93,27 @@ treechildren:-moz-tree-cell-text(selected) {
   color: #000000;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected) {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
 treechildren:-moz-tree-cell-text(selected, focus) {
   color: #FFFFFF;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, focus) {
+  background-color: #424F63;
+  color: #FFFFFF;
+}
+
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, current, focus) {
+  border-color: #000000;
+}
+
 /* ::::: lines connecting cells ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-line,
 treechildren:-moz-tree-line {
   border: 1px dotted #808080;
 }
@@ -112,6 +131,7 @@ treechildren:-moz-tree-separator {
 
 /* ::::: drop feedback ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, dropOn),
 treechildren:-moz-tree-cell-text(primary, dropOn) {
   background-color: #424F63;
   color: #FFFFFF;