From 11a750f6a0642622fc1c3759e7d97048ef4d97cd Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Wed, 1 May 2013 12:17:57 -0700
Subject: [PATCH] Changes according to Philip's feedback: spacing around
 operators, removed unused variables, moved font family names to #defines.

---
 interface/src/Avatar.cpp        | 2 +-
 interface/src/Log.cpp           | 4 +++-
 interface/src/Util.cpp          | 4 ++--
 interface/src/Util.h            | 7 +++++++
 interface/src/ui/MenuColumn.cpp | 6 ++----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp
index 36e9843672..b52e7484e1 100644
--- a/interface/src/Avatar.cpp
+++ b/interface/src/Avatar.cpp
@@ -677,7 +677,7 @@ void Avatar::setDisplayingHead( bool displayingHead ) {
 
 
 static TextRenderer* textRenderer() {
-    static TextRenderer* renderer = new TextRenderer("Helvetica", 24);
+    static TextRenderer* renderer = new TextRenderer(SANS_FONT_FAMILY, 24);
     return renderer;
 }
 
diff --git a/interface/src/Log.cpp b/interface/src/Log.cpp
index be66bd3a76..5fcfb51e25 100644
--- a/interface/src/Log.cpp
+++ b/interface/src/Log.cpp
@@ -24,6 +24,8 @@ namespace {
     unsigned const LINE_BUFFER_SIZE = 256;          // number of lines that are buffered
     unsigned const MAX_MESSAGE_LENGTH = 512;        // maximum number of characters for a message
 
+    const char* FONT_FAMILY = SANS_FONT_FAMILY;
+    
     bool const TEXT_MONOSPACED = true;
 
     float const TEXT_RED = 0.7f;
@@ -196,7 +198,7 @@ void Log::setCharacterSize(unsigned width, unsigned height) {
 }
 
 static TextRenderer* textRenderer() {
-    static TextRenderer* renderer = new TextRenderer("Helvetica");
+    static TextRenderer* renderer = new TextRenderer(FONT_FAMILY);
     return renderer;
 }
 
diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp
index 1dbe95d42d..ef51f9b72a 100644
--- a/interface/src/Util.cpp
+++ b/interface/src/Util.cpp
@@ -153,8 +153,8 @@ double diffclock(timeval *clock1,timeval *clock2)
 }
 
 static TextRenderer* textRenderer(int mono) {
-    static TextRenderer* monoRenderer = new TextRenderer("Courier");
-    static TextRenderer* proportionalRenderer = new TextRenderer("Helvetica");
+    static TextRenderer* monoRenderer = new TextRenderer(MONO_FONT_FAMILY);
+    static TextRenderer* proportionalRenderer = new TextRenderer(SANS_FONT_FAMILY);
     return mono ? monoRenderer : proportionalRenderer;
 }
 
diff --git a/interface/src/Util.h b/interface/src/Util.h
index 70794898f6..02b3ae8152 100644
--- a/interface/src/Util.h
+++ b/interface/src/Util.h
@@ -19,6 +19,13 @@
 
 #include <Orientation.h>
 
+// the standard sans serif font family
+#define SANS_FONT_FAMILY "Helvetica"
+
+// the standard mono font family
+#define MONO_FONT_FAMILY "Courier"
+
+
 void eulerToOrthonormals(glm::vec3 * angles, glm::vec3 * fwd, glm::vec3 * left, glm::vec3 * up);
 
 float azimuth_to(glm::vec3 head_pos, glm::vec3 source_pos);
diff --git a/interface/src/ui/MenuColumn.cpp b/interface/src/ui/MenuColumn.cpp
index 2eea8e3235..a70e261c52 100644
--- a/interface/src/ui/MenuColumn.cpp
+++ b/interface/src/ui/MenuColumn.cpp
@@ -139,13 +139,11 @@ int MenuColumn::getMaxRowWidth() {
 }
 
 static TextRenderer* textRenderer() {
-    static TextRenderer* renderer = new TextRenderer("Helvetica", 11);
+    static TextRenderer* renderer = new TextRenderer(SANS_FONT_FAMILY, 11);
     return renderer;
 }
 
 void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) {
-    float scale = 0.09;
-    int mono = 0;
     int numberOfRows = rows.size();
     if (numberOfRows > 0) {
 
@@ -165,7 +163,7 @@ void MenuColumn::render(int yOffset, int menuHeight, int lineHeight) {
     for (unsigned int i = 0; i < rows.size(); ++i) {
         rowName = rows[i].getName();
         glColor3f(0, 0, 0);
-        textRenderer()->draw(leftPosition + SPACE_BEFORE_ROW_NAME, y+5 + yOffset, rowName);
+        textRenderer()->draw(leftPosition + SPACE_BEFORE_ROW_NAME, y + 5 + yOffset, rowName);
         y += lineHeight;
     }
     renderMouseOver(yOffset);