From 95646b10b0ac8eb8221d06adffc157faf33f1ed4 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <mozilla@noorenberghe.ca>
Date: Tue, 4 Jun 2013 00:24:29 -0700
Subject: [PATCH] Bug 879147 - Don't move OS X titlebar placeholders in RTL
 mode. r=dao,mconley

---
 browser/base/content/browser.xul | 13 ++++---------
 browser/themes/osx/browser.css   | 10 ++++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 0c4baabe2c4..e345e815ab3 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -485,15 +485,13 @@
 
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="caption-buttons"
-#ifdef XP_MACOSX
-            ordinal="0"
-#else
+#ifndef XP_MACOSX
             ordinal="1000"
 #endif
       />
 
 #ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button" ordinal="1000"/>
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
 #endif
     </toolbar>
@@ -856,16 +854,13 @@
 
 #ifdef CAN_DRAW_IN_TITLEBAR
       <hbox class="titlebar-placeholder" type="caption-buttons"
-#ifdef XP_MACOSX
-            ordinal="0"
-#else
+#ifndef XP_MACOSX
             ordinal="1000"
 #endif
       />
 
 #ifdef XP_MACOSX
-      <hbox class="titlebar-placeholder" type="fullscreen-button"
-            ordinal="1000"/>
+      <hbox class="titlebar-placeholder" type="fullscreen-button"/>
 #endif
 #endif
     </toolbar>
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 270fa233236..664036ace97 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -48,6 +48,16 @@
   display: none;
 }
 
+/* Fullscreen and caption buttons don't move with RTL on OS X so override the automatic ordering. */
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 1000;
+}
+.titlebar-placeholder[type="caption-buttons"]:-moz-locale-dir(ltr),
+.titlebar-placeholder[type="fullscreen-button"]:-moz-locale-dir(rtl) {
+  -moz-box-ordinal-group: 0;
+}
+
 #titlebar {
   padding-top: 9px;
 }