From 3943d95eb6ef751bcb9295765dd9ad097ab8a084 Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 11 May 2006 01:48:26 +0000
Subject: [PATCH] Bug 337292: rework search bar so that flex doesn't break the
 background on Mac, patch by Joe Hughes, r=gavin, r+a181=mconnor

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@196287 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/search/content/search.xml      |  88 ++++++++++--------
 .../browser/themes/pinstripe/browser/jar.mn   |   4 +-
 .../browser/search-bar-background-left.png    | Bin 0 -> 580 bytes
 .../browser/search-bar-background-mid.png     | Bin 0 -> 159 bytes
 .../browser/search-bar-background-right.png   | Bin 0 -> 626 bytes
 .../themes/pinstripe/browser/searchbar.css    |  21 ++++-
 6 files changed, 70 insertions(+), 43 deletions(-)
 create mode 100755 mozilla/browser/themes/pinstripe/browser/search-bar-background-left.png
 create mode 100755 mozilla/browser/themes/pinstripe/browser/search-bar-background-mid.png
 create mode 100755 mozilla/browser/themes/pinstripe/browser/search-bar-background-right.png

diff --git a/mozilla/browser/components/search/content/search.xml b/mozilla/browser/components/search/content/search.xml
index 00a67c27765..991fa1613af 100644
--- a/mozilla/browser/components/search/content/search.xml
+++ b/mozilla/browser/components/search/content/search.xml
@@ -57,36 +57,43 @@
   <binding id="searchbar"
            extends="chrome://browser/content/search/search.xml#searchbar-base">
     <content>
-      <xul:stringbundle src="chrome://browser/locale/search.properties"/>
-      <xul:textbox class="searchbar-textbox"
-                   type="autocomplete"
-                   flex="1"
-                   autocompletepopup="PopupAutoComplete"
-                   autocompletesearch="form-history"
-                   autocompletesearchparam="searchbar-history"
-                   completeselectedindex="true"
-                   tabscrolling="true"
-                   xbl:inherits="disableautocomplete,searchengine,src">
-        <xul:image align="center" class="searchbar-engine-image" xbl:inherits="src"/>
-        <xul:hbox class="search-go-button-container"> 
+      <xul:stringbundle src="chrome://browser/locale/search.properties"
+                        anonid="searchbar-stringbundle"/>
+      <xul:box class="searchbar-left" flex="1">
+        <xul:box class="searchbar-right" flex="1">
+          <xul:textbox class="searchbar-textbox"
+                       anonid="searchbar-textbox"
+                       type="autocomplete"
+                       flex="1"
+                       autocompletepopup="PopupAutoComplete"
+                       autocompletesearch="form-history"
+                       autocompletesearchparam="searchbar-history"
+                       completeselectedindex="true"
+                       tabscrolling="true"
+                       xbl:inherits="disableautocomplete,searchengine,src">
+            <xul:image align="center" class="searchbar-engine-image" 
+                       xbl:inherits="src"/>
+            <xul:hbox class="search-go-button-container"> 
 # XXX We'd like to add a context="_child" property to this toolbarbutton, but doing
 # so causes the context menu to show up for the textbox too, and subsequently crashes
 # the app on shutdown.  See bug 336662.
-          <xul:toolbarbutton class="search-go-button"
-                             type="menu-button"
-                             anonid="searchbar-dropmarker"
-                             xbl:inherits="src">
-            <xul:menupopup anonid="searchbar-popup"
-                           class="searchbar-popup"
-                           position="after_end">
-              <xul:menuseparator/>
-              <xul:menuitem anonid="open-engine-manager"
-                            label="&cmd_engineManager.label;"
-                            accesskey="&cmd_engineManager.accesskey;"/>
-            </xul:menupopup>
-          </xul:toolbarbutton>
-        </xul:hbox>
-      </xul:textbox>
+              <xul:toolbarbutton class="search-go-button"
+                                 type="menu-button"
+                                 anonid="searchbar-dropmarker"
+                                 xbl:inherits="src">
+                <xul:menupopup anonid="searchbar-popup"
+                               class="searchbar-popup"
+                               position="after_end">
+                  <xul:menuseparator/>
+                  <xul:menuitem anonid="open-engine-manager"
+                                label="&cmd_engineManager.label;"
+                                accesskey="&cmd_engineManager.accesskey;"/>
+                </xul:menupopup>
+              </xul:toolbarbutton>
+            </xul:hbox>
+          </xul:textbox>
+        </xul:box>
+      </xul:box>
     </content>
     <implementation implements="nsIObserver">
 
@@ -124,8 +131,8 @@
         this._textbox.mController.input = null;
       ]]></destructor>
 
-      <field name="_stringBundle">document.getAnonymousNodes(this)[0];</field>
-      <field name="_textbox">document.getAnonymousNodes(this)[1];</field>
+      <field name="_stringBundle">document.getAnonymousElementByAttribute(this, "anonid", "searchbar-stringbundle");</field>
+      <field name="_textbox">document.getAnonymousElementByAttribute(this, "anonid", "searchbar-textbox");</field>
       <field name="_popup">null</field>
       <field name="_ss">null</field>
       <field name="_engines">null</field>
@@ -400,7 +407,7 @@
           }
           
           var newTab = textBox._prefBranch.getBoolPref("browser.search.openintab");
-          textBox.parentNode.doSearch(textValue, ((aEvent && aEvent.altKey) ^ newTab));
+          this.doSearch(textValue, ((aEvent && aEvent.altKey) ^ newTab));
         ]]></body>
       </method>
 
@@ -449,7 +456,7 @@
       extends="chrome://global/content/bindings/autocomplete.xml#autocomplete">
     <implementation>
       <constructor><![CDATA[
-        if (this.parentNode.parentNode.parentNode.localName ==
+        if (this._getParentSearchbar().parentNode.parentNode.localName ==
             "toolbarpaletteitem")
           return;
         setTimeout(function(a) { a.initialize(); }, 0, this);
@@ -463,12 +470,13 @@
         } catch (ex) { }
       ]]></destructor>
 
-      <field name="_stringBundle">this.parentNode._stringBundle</field>
+      <field name="_stringBundle"/>
       <field name="_formHistSvc"/>
       <field name="_prefBranch"/>
 
       <method name="initialize">
         <body><![CDATA[
+          this._stringBundle = this._getParentSearchbar()._stringBundle;
           this._formHistSvc =
                    Components.classes["@mozilla.org/satchel/form-history;1"]
                              .getService(Components.interfaces.nsIFormHistory2);
@@ -513,12 +521,18 @@
         </body>
       </method>
 
-      <!-- Returns the main searchbox element.  This is abstracted in
-           case the structure of this control gets more complicated.
+      <!-- Returns the closest parent that is a searchbar element.
+           If no searchbar element is found, returns null.
       -->
       <method name="_getParentSearchbar">
         <body><![CDATA[
-          return this.parentNode;
+          var searchbar = this.parentNode;
+          while (searchbar) {
+            if (searchbar.nodeName == "searchbar")
+              break;
+            searchbar = searchbar.parentNode;
+          }
+          return searchbar;
         ]]></body>
       </method>
 
@@ -601,11 +615,11 @@
     <handlers>
       <handler event="keypress" keycode="vk_up" modifiers="accel"
                phase="capturing"
-               action="this.parentNode.selectEngine(event, false);"/>
+               action="this._getParentSearchbar().selectEngine(event, false);"/>
 
       <handler event="keypress" keycode="vk_down" modifiers="accel"
                phase="capturing"
-               action="this.parentNode.selectEngine(event, true);"/>
+               action="this._getParentSearchbar().selectEngine(event, true);"/>
 
       <handler event="keypress" keycode="vk_down" modifiers="alt"
                phase="capturing"
diff --git a/mozilla/browser/themes/pinstripe/browser/jar.mn b/mozilla/browser/themes/pinstripe/browser/jar.mn
index 9e33718c991..5b52c20ca43 100644
--- a/mozilla/browser/themes/pinstripe/browser/jar.mn
+++ b/mozilla/browser/themes/pinstripe/browser/jar.mn
@@ -20,7 +20,9 @@ classic.jar:
   skin/classic/browser/pageInfo.css
   skin/classic/browser/Popup-blocked.png
   skin/classic/browser/searchbar.css
-  skin/classic/browser/search-bar-background.png
+  skin/classic/browser/search-bar-background-left.png
+  skin/classic/browser/search-bar-background-mid.png
+  skin/classic/browser/search-bar-background-right.png
   skin/classic/browser/Search-bar.png
   skin/classic/browser/Search.png
   skin/classic/browser/Search-add-engines.png
diff --git a/mozilla/browser/themes/pinstripe/browser/search-bar-background-left.png b/mozilla/browser/themes/pinstripe/browser/search-bar-background-left.png
new file mode 100755
index 0000000000000000000000000000000000000000..30a6d7c3f116ba1f2f0f0328c749b804ae1b496b
GIT binary patch
literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000XB000&U1^@s67UX7Q00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&&U_IVy6Au%7?`0ntfB
zK~yNujg!ra+E5sV-<%|4ehh|~=pl}X5Q8CfFstbdbe3}gx^Y193ff)wUGzG1=Tz^Y
z+is-bqR>S*?i3M0M1-J7a=I9><8)H{z}Y?D`<@TZ;TU6hje5QAYMOSZD9Uvzm8uDX
z;BhbIMx$|Q7{&vov`r~}W11#1nG9rE#);f+w{LCReqX6nn&omC`FtLlra_iv2!ilO
z?sPggj^ljtegEEdU09X{RaGI1B6yw$Ap`;dv|6o8$8kOcL2&PR9!%4OqA1{b9vsJk
z<2V3#k_&~xgYWxI&-0MW<si%QQG5<RpU>TDwfZ>-g1l|pCy6g1rfI$_l}cBX(!|80
zoXuw6Qc9t!>eI#vA^;Fw*K4}2<Kp7tpCSMdMNvFeRY3?jFN>mhw*Dvs_!UJF{s(e6
z9DeL}J0v}*6FCgS@7wJbaU7o=Ae+tR+iJD?8HVBcbjBEl!{NutWWx6QJ&WU*B|!jS
zu~<A#r_(R%^%_wWB{wj}z!*cf+r1r+$6uGrB|97ruQuTM>G%6LqtWPbHk+|93|SOK
zCqsXIt6r~HEEbDRN@>e5j4MS^AW0HLQ3RKCzrkSOT9$Q}PN%OWNviQY@BIcR8Q~L%
SH#%?t0000<MNUMnLSTX#+xtxb

literal 0
HcmV?d00001

diff --git a/mozilla/browser/themes/pinstripe/browser/search-bar-background-mid.png b/mozilla/browser/themes/pinstripe/browser/search-bar-background-mid.png
new file mode 100755
index 0000000000000000000000000000000000000000..44894c03952e5e562e2228422e02b79faeebfc2a
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{L!3JU-`?d;5u_bxCyD<C*!3BGlPX>x`7I;J!
zGca%qgD@k*tT_@uLG}_)Usv{PtXvF&iW}lMPXL8<JY5_^IIgcfV#vr~z;R$hQ>Mxz
yMsbM+#v5f8u3EA?wfyP3GaU+z@hhL4`M{8HPuNUbW{Dh7AA_f>pUXO@geCyhqAgee

literal 0
HcmV?d00001

diff --git a/mozilla/browser/themes/pinstripe/browser/search-bar-background-right.png b/mozilla/browser/themes/pinstripe/browser/search-bar-background-right.png
new file mode 100755
index 0000000000000000000000000000000000000000..6f9e5b0234283302f6a3f97fcc344a510a9164ab
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000aC000&U1^@s6^f-MQ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&&U_I~H%yu9^S<0sl!v
zK~y-)jnq4<8bK5X@c*pqa~nYmOWPEIbRkXJe1U+m_ag-R^r_NYNP^xV+TZp@F&7MI
zt{|+6;##Z^e69PC*_o3jN(8;}v~zyLIfpaD^7%XoA#C6GdxyiJ?KsY(WmylkT204=
zV2wtDIOlL(7u)R?%jFWLX+D{z`E|8gm8;e2^bBk^8xlgm_kFmo3(K-Fo6Rs9jnMD+
z?+nBEQYw|2Cm^LHB7&3>LI`lqVcRwqiv@IDN4ML(9}b6~ip63R093{p7-LWr1%W^S
z!C(;Ka2SzD1kq>|p-||ZlyaTTW~b$H*-+2w`->T4&@>H-q5uF~*Ztr)&MyF;84=N?
zX%G>F5U_0<<M9~vdi|->>AY8PB^YA}1OkXgqe!JvNT<^;6N$vztKf)KRfVQ$NTpIp
zCX=t91xFMLg%FR&5s$}T-2@axfu?DQ#bPi13;r!F7!2Yj002S=0O;KWhzOqNfpgwg
zZb_C>!m=#bw*B)a;5ZIetJUw_ZubN9Oh_r|a5&IlFrZ4M@{x$HH+@`<^?D7%FzzOk
z$@k;I#hW?jG@s9@)oR@r3WYaB1R^>IQc4m+kmEQsoldFQY?e!<(kYpUpdP2dIfv(Y
zrv^>a{5Bqs%eh?c?1`$nuEY0zTL{tfJg>dq?;jV7#X}~Ox%dhE0oDzMs5AS&zyJUM
M07*qoM6N<$g54++y#N3J

literal 0
HcmV?d00001

diff --git a/mozilla/browser/themes/pinstripe/browser/searchbar.css b/mozilla/browser/themes/pinstripe/browser/searchbar.css
index ed8291630b6..852ac0eb014 100644
--- a/mozilla/browser/themes/pinstripe/browser/searchbar.css
+++ b/mozilla/browser/themes/pinstripe/browser/searchbar.css
@@ -1,6 +1,7 @@
 .searchbar-textbox {
-  background: url("chrome://browser/skin/search-bar-background.png") no-repeat;
-  margin: 4px 3px 4px 3px;
+  background: url("chrome://browser/skin/search-bar-background-mid.png") repeat-x;
+  
+  margin: 4px 11px 4px 11px;
   -moz-appearance: none;
   font: icon;
   height: 22px !important;
@@ -8,10 +9,20 @@
   border: none !important;
 }
 
+.searchbar-left {
+  background: url("chrome://browser/skin/search-bar-background-left.png") no-repeat left center;
+  margin-left: 3px;
+}
+
+.searchbar-right {
+  background: url("chrome://browser/skin/search-bar-background-right.png") no-repeat right center;
+  margin-right: 3px;
+}
+
 .searchbar-engine-image {
   width: 16px;
   height: 16px;
-  margin: 3px 3px 3px 10px;
+  margin: 3px 3px 3px 0px;
   list-style-image: url("chrome://browser/skin/Search-bar.png");
 }
 
@@ -21,9 +32,9 @@
 
 .autocomplete-textbox-container {
   border: none;
-  padding-right: 6px;
+  padding-right: 0px;
   height: 21px !important;
-  margin: 0px;
+  margin: 0px -5px 0px -1px;
 }
 
 .search-go-button {