# HG changeset patch
# User Chris Cannam
# Date 1435670182 -3600
# Node ID 50940a7425aec6309bb26156b6f5e155d71f3fa1
# Parent  66da6f009edd658211ef7fa5ceedf028a6d97f68# Parent  bc23c2cfff65112d2ed31ee870aff45e5fcae079
Merge

diff -r bc23c2cfff65 -r 50940a7425ae widgets/PropertyBox.cpp
--- a/widgets/PropertyBox.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/widgets/PropertyBox.cpp	Tue Jun 30 14:16:22 2015 +0100
@@ -63,6 +63,12 @@
     m_mainBox = new QVBoxLayout;
     setLayout(m_mainBox);
 
+#ifdef Q_OS_MAC
+    QMargins mm = m_mainBox->contentsMargins();
+    QMargins mmhalf(mm.left()/2, mm.top()/3, mm.right()/2, mm.bottom()/3);
+    m_mainBox->setContentsMargins(mmhalf);
+#endif
+
 //    m_nameWidget = new QLabel;
 //    m_mainBox->addWidget(m_nameWidget);
 //    m_nameWidget->setText(container->objectName());
diff -r bc23c2cfff65 -r 50940a7425ae widgets/PropertyStack.cpp
--- a/widgets/PropertyStack.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/widgets/PropertyStack.cpp	Tue Jun 30 14:16:22 2015 +0100
@@ -50,7 +50,7 @@
     tabBar()->setUsesScrollButtons(true); 
     tabBar()->setIconSize(QSize(16, 16));
 #endif
-    
+
     repopulate();
 
     connect(this, SIGNAL(currentChanged(int)),