From facf9d41c7d1db3ddb3dab11138066fe1445b2e1 Mon Sep 17 00:00:00 2001
From: Blair McBride <bmcbride@mozilla.com>
Date: Thu, 1 Oct 2009 16:12:29 +0200
Subject: [PATCH] Bug 467601 - long page titles hide tagging icon and tags'
 text in location bar dropdown list. r=enn

---
 toolkit/content/widgets/autocomplete.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 8283262c95d4..af79d0fa155a 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -1148,14 +1148,14 @@
         <xul:hbox anonid="title-box" class="ac-title" flex="1"
                   onunderflow="_doUnderflow('_title');">
           <xul:description anonid="title" class="ac-normal-text ac-comment" xbl:inherits="selected"/>
-          <xul:hbox anonid="extra-box" class="ac-extra" align="center" hidden="true">
-            <xul:image class="ac-result-type-tag"/>
-            <xul:label class="ac-normal-text ac-comment" xbl:inherits="selected" value=":"/>
-            <xul:description anonid="extra" class="ac-normal-text ac-comment" xbl:inherits="selected"/>
-          </xul:hbox>
         </xul:hbox>
         <xul:label anonid="title-overflow-ellipsis" xbl:inherits="selected"
                    class="ac-ellipsis-after ac-comment" hidden="true"/>
+        <xul:hbox anonid="extra-box" class="ac-extra" align="center" hidden="true">
+          <xul:image class="ac-result-type-tag"/>
+          <xul:label class="ac-normal-text ac-comment" xbl:inherits="selected" value=":"/>
+          <xul:description anonid="extra" class="ac-normal-text ac-comment" xbl:inherits="selected"/>
+        </xul:hbox>
         <xul:image anonid="type-image" class="ac-type-icon"/>
       </xul:hbox>
       <xul:hbox align="center" class="ac-url-box">
@@ -1386,7 +1386,6 @@
             this._extraBox.hidden = false;
             this._extraBox.childNodes[0].hidden = false;
             this._extraBox.childNodes[1].hidden = true;
-            this._extraBox.flex = 1;
             this._extraBox.pack = "end";
 
             // The title is separated from the tags by an endash
@@ -1406,7 +1405,6 @@
             this._extraBox.hidden = false;
             this._extraBox.childNodes[0].hidden = true;
             this._extraBox.childNodes[1].hidden = false;
-            this._extraBox.flex = 0;
             this._extraBox.pack = "start";
             
             // Put the parameters next to the title if we have any