From 524ee6295825d0c1d2d556ee00e28266849d279c Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Wed, 14 Jun 2000 06:13:39 +0000
Subject: [PATCH] 30511. r=ben

---
 .../base/resources/content/folderPane.xul     | 13 ++++----
 .../resources/content/msgMail3PaneWindow.js   |  2 ++
 .../base/resources/content/threadPane.xul     | 31 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index bf6043e7c385..9772f6f3799b 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -41,6 +41,10 @@
 		ondragdrop="return DropOnFolderTree(event);"
 		onclick="FolderPaneOnClick(event);"> 
 
+    <treecols>
+	    <treecol persist="width" width="1*" flex="1" id="FolderColumn" rdf:resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
+    </treecols>
+
 	  <template>
 	  	<rule>
 	      <treechildren>
@@ -62,7 +66,7 @@
                    IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
 			             HasUnreadMessages="rdf:http://home.netscape.com/NC-rdf#HasUnreadMessages"
 			             NoSelect="rdf:http://home.netscape.com/NC-rdf#NoSelect">
-					<treecell tooltip="folderTooltip" indent="true" class="treecell-indent tree-cell-folderpane-icon" 
+					<treecell indent="true" class="treecell-indent tree-cell-folderpane-icon" 
                     value="rdf:http://home.netscape.com/NC-rdf#FolderTreeName"
                     SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 			              BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -81,12 +85,7 @@
 	       </treechildren>
 		</rule>
 	  </template>
-
-	  <treecol persist="width" width="3*" id="FolderColumn" rdf:resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
-          <treehead>
-            <treerow>
-            </treerow>
-          </treehead>
+    <treechildren flex="1"/>
 	</tree>
 
 </overlay>
diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index df3e4c7df836..0b5940e09667 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -592,6 +592,7 @@ function GetSelectedMessage()
 
 function ThreadPaneOnClick(event)
 {
+dump("YUMMY!\n");
     var targetclass = event.target.getAttribute('class');
     debug('targetclass = ' + targetclass + '\n');
 
@@ -611,6 +612,7 @@ function ThreadPaneOnClick(event)
     }
 	else if(event.detail == 2)
 	{
+    dump("Howdy partner.\n");
 		ThreadPaneDoubleClick(event.target.parentNode.parentNode);
 	}
 }
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index ce552a99da73..a55f6a213cc3 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -43,11 +43,7 @@ Rights Reserved.
 
   <template>
   	<rule>
-          <treechildren onclick="ThreadPaneOnClick(event);"
-			ondragover="return DragOverTree(event);"
-			ondraggesture="return BeginDragThreadTree(event);"
-			ondragdrop="return DropOnThreadTree(event);"> 
-
+    <treechildren>
 		<treeitem uri="..."
 			 Status="rdf:http://home.netscape.com/NC-rdf#Status"
   			 Flagged="rdf:http://home.netscape.com/NC-rdf#Flagged"
@@ -89,21 +85,21 @@ Rights Reserved.
 	</rule>
   </template>
 
-  <treecolgroup id="theThreadColumns">
+  <treecols id="theThreadColumns">
 	  <treecol persist="hidden width" fixed="true" width="20" id="ThreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#Thread"/>
-	  <treecol persist="hidden width" width="7*" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
-	  <treecol persist="hidden width" width="4*" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
+	  <treecol persist="hidden width" width="7*" flex="7" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
+	  <treecol persist="hidden width" width="4*" flex="4" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
 	  <treecol persist="hidden width" fixed="true" width="20" id="UnreadButtonColumn"/>
-	  <treecol persist="hidden width" width="2*" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
-	  <treecol persist="hidden width" width="1*" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
+	  <treecol persist="hidden width" width="2*" flex="2" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
+	  <treecol persist="hidden width" width="1*" flex="1" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
 	  <treecol persist="hidden width" fixed="true" width="20" id="FlaggedButtonColumn"/>
-	  <treecol persist="hidden width" width="1*" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
-	  <treecol persist="hidden width" width="1*" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
-	  <treecol persist="hidden width" width="1*" id="UnreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
-	  <treecol persist="hidden width" width="1*" id="TotalColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
+	  <treecol persist="hidden width" width="1*" flex="1" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
+	  <treecol persist="hidden width" width="1*" flex="1" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
+	  <treecol persist="hidden width" width="1*" flex="1" id="UnreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
+	  <treecol persist="hidden width" width="1*" flex="1" id="TotalColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
 	  <treecol persist="hidden width" fixed="true" width="1" id="OrderReceivedColumn" rdf:resource="http://home.netscape.com/NC-rdf#OrderReceived"/>
 	  <treecol persist="width" fixed="true" width="16" id="PopupColumn"/>
-  </treecolgroup>
+  </treecols>
 
   <treehead>
     <treerow id="headRow">
@@ -130,6 +126,9 @@ Rights Reserved.
 		</treecell>
 	</treerow>
   </treehead>
-
+  <treechildren flex="1" onclick="ThreadPaneOnClick(event);"
+			ondragover="return DragOverTree(event);"
+			ondraggesture="return BeginDragThreadTree(event);"
+			ondragdrop="return DropOnThreadTree(event);"/> 
 </tree>
 </overlay>