From 732ad8f9933f9eb2d8b50037ab3a6ecea244e95e Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 24 Nov 2014 18:33:10 -0800
Subject: [PATCH] Use valid font for Windows so that '-'s are displayed

---
 interface/src/Util.cpp              | 3 ++-
 interface/src/ui/BandwidthMeter.cpp | 2 +-
 interface/src/ui/TextRenderer.h     | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index c2e9a2d7e3..c4f2ec8468 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -100,7 +100,8 @@ static TextRenderer* textRenderer(int mono) {
     static TextRenderer* monoRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY); 
     static TextRenderer* proportionalRenderer = TextRenderer::getInstance(SANS_FONT_FAMILY,
         -1, -1, false, TextRenderer::SHADOW_EFFECT);
-    static TextRenderer* inconsolataRenderer = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false);
+    static TextRenderer* inconsolataRenderer = TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, INCONSOLATA_FONT_WEIGHT, 
+        false);
     switch (mono) {
         case 1:
             return monoRenderer;
diff --git a/interface/src/ui/BandwidthMeter.cpp b/interface/src/ui/BandwidthMeter.cpp
index 327f266106..a0a8129229 100644
--- a/interface/src/ui/BandwidthMeter.cpp
+++ b/interface/src/ui/BandwidthMeter.cpp
@@ -50,7 +50,7 @@ BandwidthMeter::ChannelInfo BandwidthMeter::_CHANNELS[] = {
 };
 
 BandwidthMeter::BandwidthMeter() :
-    _textRenderer(TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, QFont::Bold, false)),
+    _textRenderer(TextRenderer::getInstance(INCONSOLATA_FONT_FAMILY, -1, INCONSOLATA_FONT_WEIGHT, false)),
     _scaleMaxIndex(INITIAL_SCALE_MAXIMUM_INDEX) {
 
     _channels = static_cast<ChannelInfo*>( malloc(sizeof(_CHANNELS)) );
diff --git a/interface/src/ui/TextRenderer.h b/interface/src/ui/TextRenderer.h
index 9afb885e35..2ffd8b24b7 100644
--- a/interface/src/ui/TextRenderer.h
+++ b/interface/src/ui/TextRenderer.h
@@ -35,7 +35,13 @@ const char SOLID_BLOCK_CHAR = 127;
 #define MONO_FONT_FAMILY "Courier"
 
 // the Inconsolata font family
+#ifdef Q_OS_WIN
+#define INCONSOLATA_FONT_FAMILY "Fixedsys"
+#define INCONSOLATA_FONT_WEIGHT QFont::Normal
+#else
 #define INCONSOLATA_FONT_FAMILY "Inconsolata"
+#define INCONSOLATA_FONT_WEIGHT QFont::Bold
+#endif
 
 class Glyph;