Bug 399193 - Search boxes render wrong in rtl, r=mscott

mail/base/content/mailWindowOverlay.xul

@@ -2104,8 +2104,9 @@
       <toolbaritem id="search-container" title="&searchItem.title;" align="center" class="chromeclass-toolbar-additional">
         <textbox id="searchInput" flex="1" onfocus="onSearchInputFocus(event);" onclick="onSearchInputClick(event);"
                  onmousedown="onSearchInputMousedown(event);" onblur="onSearchInputBlur(event);"
-                 oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);">
-          <button id="quick-search-button" type="menu">
+                 oninput="onSearchInput(false);"
+                 onkeypress="onSearchKeyPress(event);" chromedir="&locale.dir;">
+          <button id="quick-search-button" type="menu" chromedir="&locale.dir;">
             <menupopup id="quick-search-menupopup" value="2" persist="value" onpopupshowing="InitQuickSearchPopup();" popupalign="topleft" popupanchor="bottomleft">
               <menuitem value="0" label="&searchSubjectMenu.label;" type="radio"
                         oncommand="changeQuickSearchMode(this)"/>

mail/base/content/search.xml

@@ -38,6 +38,11 @@
 # the terms of any one of the MPL, the GPL or the LGPL.
 # ***** END LICENSE BLOCK *****
 
+<!DOCTYPE bindings [
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+%globalDTD;
+]>
+
 <bindings id="SearchBindings"
    xmlns="http://www.mozilla.org/xbl"
    xmlns:html="http://www.w3.org/1999/xhtml"
@@ -54,7 +59,10 @@
         <html:input class="textbox-input" flex="1" anonid="input" allowevents="true"
                     xbl:inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly,tabindex,accesskey"/>
       </xul:hbox>
-      <xul:toolbarbutton id="quick-search-clearbutton" xbl:inherits="" disabled="true" class="quick-search-clearbutton" onclick="onClearSearch(); return false;"/>
+      <xul:toolbarbutton id="quick-search-clearbutton" xbl:inherits=""
+                         disabled="true" class="quick-search-clearbutton"
+                         onclick="onClearSearch(); return false;"
+                         chromedir="&locale.dir;"/>
     </content>
 
     <implementation>

mail/components/addrbook/content/abContactsPanel.xul

@@ -49,6 +49,8 @@
 %abResultsPaneOverlayDTD;
 <!ENTITY % abContactsPanelDTD SYSTEM "chrome://messenger/locale/addressbook/abContactsPanel.dtd" >
 %abContactsPanelDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+%globalDTD;
 ]>
 
 <page id="abContactsPanel"
@@ -110,8 +112,8 @@
       <label value="&searchInput.label;" accesskey="&searchInput.accesskey;" control="searchInput"/>
       <textbox id="searchInput" flex="1" onfocus="onSearchInputFocus(event);" onblur="onSearchInputBlur(event);"
                onclick="this.select();" oninput="onAbSearchInput(false);"
-               onkeypress="onAbSearchKeyPress(event);">
-        <button id="quick-search-button" type="menu">
+               onkeypress="onAbSearchKeyPress(event);" chromedir="&locale.dir;">
+        <button id="quick-search-button" type="menu" chromedir="&locale.dir;">
           <menupopup id="quick-search-menupopup" value="0" persist="value" popupalign="topleft" popupanchor="bottomleft">
             <menuitem value="0" label="&SearchNameOrEmail.label;" type="radio"/>
           </menupopup>

mail/components/addrbook/content/addressbook.xul

@@ -49,6 +49,8 @@
 %abMainWindowDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
+%globalDTD;
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
 %customizeToolbarDTD;
@@ -526,8 +528,9 @@
       <toolbaritem id="search-container" title="&searchItem.title;" align="center" class="chromeclass-toolbar-additional">
         <textbox id="searchInput" flex="1" onfocus="onSearchInputFocus(event);" onblur="onSearchInputBlur(event);" 
                  onclick="this.select();" oninput="onAbSearchInput(false);"
-                 onkeypress="onAbSearchKeyPress(event);">
-          <button id="quick-search-button" type="menu">
+                 onkeypress="onAbSearchKeyPress(event);"
+                 chromedir="&locale.dir;">
+          <button id="quick-search-button" type="menu" chromedir="&locale.dir;">
             <menupopup id="quick-search-menupopup" value="0" persist="value" popupalign="topleft" popupanchor="bottomleft">
               <menuitem value="0" label="&SearchNameOrEmail.label;" type="radio"/>
             </menupopup>

mail/themes/pinstripe/mail/jar.mn

@@ -104,9 +104,11 @@ classic.jar:
      skin/classic/messenger/icons/spin-buttons-active.png           (icons/spin-buttons-active.png)
      skin/classic/messenger/icons/spin-buttons.png                  (icons/spin-buttons.png)
      skin/classic/messenger/icons/tree-selected-overlay.png         (icons/tree-selected-overlay.png)
-     skin/classic/messenger/icons/SearchBarLeft.png                 (icons/SearchBarLeft.png)
+     skin/classic/messenger/icons/SearchBarStart.png                (icons/SearchBarStart.png)
+     skin/classic/messenger/icons/SearchBarStart-rtl.png            (icons/SearchBarStart-rtl.png)
      skin/classic/messenger/icons/SearchBarMiddle.png               (icons/SearchBarMiddle.png)
-     skin/classic/messenger/icons/SearchBarRight.png                (icons/SearchBarRight.png)
+     skin/classic/messenger/icons/SearchBarEnd.png                  (icons/SearchBarEnd.png)
+     skin/classic/messenger/icons/SearchBarEnd-rtl.png              (icons/SearchBarEnd-rtl.png)
      skin/classic/messenger/icons/search-bar-background.png         (icons/search-bar-background.png)
      skin/classic/messenger/icons/Search-bar.png                    (icons/Search-bar.png)
      skin/classic/messenger/icons/attach.png                        (icons/attach.png)

mail/themes/pinstripe/mail/searchBox.css

@@ -43,7 +43,10 @@
 
 #quick-search-button {
   min-width: 22px;
-  margin: 0px 3px 0px 5px; 
+  -moz-margin-start: 5px;
+  -moz-margin-end: 3px;
+  margin-bottom: 0;
+  margin-top: 0;
 }
 
 .quick-search-button-image {
@@ -53,12 +56,15 @@
 
 
 .quick-search-button-dropmarker {
-  padding: 6px 0px 5px 17px;
+  -moz-padding-start: 17px;
+  -moz-padding-end: 0;
+  padding-top: 6px;
+  padding-bottom: 5px;
   list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
 }
 
 .quick-search-clearbutton {
-  background: url("chrome://messenger/skin/icons/SearchBarRight.png") right center no-repeat;
+  background: url("chrome://messenger/skin/icons/SearchBarEnd.png") right center no-repeat;
   list-style-image: none;
   -moz-appearance: none;
   padding: 0px !important;
@@ -67,6 +73,10 @@
   width: 20px;
 }
 
+.quick-search-clearbutton[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/icons/SearchBarEnd-rtl.png") left center no-repeat;
+}
+
 .quick-search-clearbutton[clearButtonHidden="false"] {
   list-style-image: url("chrome://global/skin/icons/closetab.png") !important;
   margin: 0px !important;
@@ -82,7 +92,7 @@
 }
 
 #searchInput {
-  background: url("chrome://messenger/skin/icons/SearchBarLeft.png") left center no-repeat;
+  background: url("chrome://messenger/skin/icons/SearchBarStart.png") left center no-repeat;
   margin: 4px !important;
   -moz-appearance: none;
   font: icon;
@@ -90,6 +100,10 @@
   border: none !important;
 }
 
+#searchInput[chromedir="rtl"] {
+  background: url("chrome://messenger/skin/icons/SearchBarStart-rtl.png") right center no-repeat;
+}
+
 #searchInput > .textbox-input-box {
   background: url("chrome://messenger/skin/icons/SearchBarMiddle.png") center repeat-x;
   border: none;
@@ -97,8 +111,3 @@
   height: 21px !important;
   margin: 0 !important;
 }
-
-#abContactsPanel #searchInput {
-  padding-left: 12px;
-}
-