Bug 877616 - Attempting to drag a window via the title bar with a Persona enabled doesn't work. r=mconley
authorRichard Marti <richard.marti@gmail.com>
Thu, 30 May 2013 21:28:09 +0200
changeset 15749 a6fbfc1ce8c46042c86d919907ee76049c646fd6
parent 15748 cf3cf361bff3fcced2db684a0a45f37ee643175e
child 15750 7e5dbdd024aef289b5f69f47bf2c279ef6a61bf2
push id942
push userbugzilla@standard8.plus.com
push dateMon, 05 Aug 2013 19:15:38 +0000
treeherdercomm-beta@0e1a1c4a9f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs877616
Bug 877616 - Attempting to drag a window via the title bar with a Persona enabled doesn't work. r=mconley
mail/base/Makefile.in
mail/themes/osx/mail/messenger.css
--- a/mail/base/Makefile.in
+++ b/mail/base/Makefile.in
@@ -23,17 +23,17 @@ endif
 ifneq (,$(filter windows gtk2 cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DHAVE_SHELL_SERVICE=1
 endif
 
 ifdef MOZ_UPDATER
 DEFINES += -DMOZ_UPDATER=1
 endif
 
-ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
+ifneq (,$(filter windows cocoa, $(MOZ_WIDGET_TOOLKIT)))
 DEFINES += -DCAN_DRAW_IN_TITLEBAR=1
 endif
 
 abs_srcdir = $(call core_abspath,$(srcdir))
 
 CHROME_DEPS += $(abs_srcdir)/content/overrides/app-license.html
 
 DEFINES += -DAPP_LICENSE_BLOCK=$(abs_srcdir)/content/overrides/app-license.html
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -6,18 +6,24 @@
   == Styles shared throughout the Messenger application.
   ======================================================================= */
 
 @import url("chrome://global/skin/");
 @import url("chrome://messenger/content/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#messengerWindow:-moz-lwtheme {
-  padding-top: 22px;
+#titlebar {
+  -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox");
+  height: 22px;
+}
+
+#titlebar-buttonbox-container,
+#messengerWindow:not([drawintitlebar=true]) > #titlebar {
+  display: none;
 }
 
 description.error {
   color: #FF0000;
 }
 
 .toolbar-primary {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");