From a48483bc1900f80585dd03deed1329a94ea36cd8 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Tue, 25 Feb 2020 10:56:04 +0000
Subject: [PATCH] Bug 2298 - Font size per-platform.

My previous fix disrupted mac font size.  Now the code should have the right font sizes for each platform.
---
 src/widgets/Ruler.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index 408b1cd46..446e8b97e 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -997,14 +997,22 @@ double SolveWarpedLength(const Envelope &env, double t0, double length)
 }
 }
 
-static constexpr int MinPixelHeight = 12;
-static constexpr int MaxPixelHeight =
-#ifdef __WXMAC__
-   12
+static constexpr int MinPixelHeight =
+#ifdef __WXMSW__
+   12;
 #else
-   14
+   10;
 #endif
-;
+
+static constexpr int MaxPixelHeight =
+#ifdef __WXMSW__
+   14;
+#elif __WXMAC__
+   10;
+#else
+   12;
+#endif
+
 
 void Ruler::Updater::ChooseFonts(
    std::unique_ptr<Fonts> &pFonts, const Fonts *pUserFonts,