# HG changeset patch
# User Chris Cannam
# Date 1544190188 0
# Node ID ac7b40a64109a9be2c6f6c7b797bf4d76b09b736
# Parent  21e03596dd93d26e66263d1d401e5036dd78413c# Parent  ad3e5693cb76f0a0879af90e4c39d54cf9f916aa
Merge from branch scale-alternative

diff -r 21e03596dd93 -r ac7b40a64109 src/changesetview.cpp
--- a/src/changesetview.cpp	Fri Dec 07 13:41:32 2018 +0000
+++ b/src/changesetview.cpp	Fri Dec 07 13:43:08 2018 +0000
@@ -59,6 +59,7 @@
 
     paint->save();
     QFont f(paint->font());
+    f.setPixelSize(11);
     f.setBold(true);
     paint->setFont(f);
 
diff -r 21e03596dd93 -r ac7b40a64109 src/panned.cpp
--- a/src/panned.cpp	Fri Dec 07 13:41:32 2018 +0000
+++ b/src/panned.cpp	Fri Dec 07 13:43:08 2018 +0000
@@ -34,6 +34,19 @@
     connect(m_dragTimer, SIGNAL(timeout()), this, SLOT(dragTimerTimeout()));
     setRenderHints(QPainter::Antialiasing |
                    QPainter::TextAntialiasing);
+
+    double baseEm;
+#ifdef Q_OS_MAC
+    baseEm = 17.0;
+#else
+    baseEm = 15.0;
+#endif
+    double em = QFontMetrics(QFont()).height();
+    double ratio = em / baseEm;
+
+    QMatrix m = matrix();
+    m.scale(ratio, ratio);
+    setMatrix(m);
 }
 
 void