From 123773a8e384e56e52c120ab78fa4efced831ab1 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 30 Jun 2014 12:20:05 -0700
Subject: [PATCH] Add default background color and initialize property

---
 interface/src/ui/overlays/Overlay.cpp     | 2 +-
 interface/src/ui/overlays/Overlay.h       | 2 +-
 interface/src/ui/overlays/TextOverlay.cpp | 1 +
 interface/src/ui/overlays/TextOverlay.h   | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/Overlay.cpp b/interface/src/ui/overlays/Overlay.cpp
index 8ec7cbace1..bc7096c471 100644
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@@ -22,7 +22,7 @@
 Overlay::Overlay() :
     _parent(NULL),
     _alpha(DEFAULT_ALPHA),
-    _color(DEFAULT_BACKGROUND_COLOR),
+    _color(DEFAULT_OVERLAY_COLOR),
     _visible(true),
     _anchor(NO_ANCHOR)
 {
diff --git a/interface/src/ui/overlays/Overlay.h b/interface/src/ui/overlays/Overlay.h
index 7667b3d3fd..f8d6400bf6 100644
--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@@ -21,7 +21,7 @@
 
 #include <SharedUtil.h> // for xColor
 
-const xColor DEFAULT_BACKGROUND_COLOR = { 255, 255, 255 };
+const xColor DEFAULT_OVERLAY_COLOR = { 255, 255, 255 };
 const float DEFAULT_ALPHA = 0.7f;
 
 class Overlay : public QObject {
diff --git a/interface/src/ui/overlays/TextOverlay.cpp b/interface/src/ui/overlays/TextOverlay.cpp
index 5fc98810be..691179ec54 100644
--- a/interface/src/ui/overlays/TextOverlay.cpp
+++ b/interface/src/ui/overlays/TextOverlay.cpp
@@ -18,6 +18,7 @@
 #include "ui/TextRenderer.h"
 
 TextOverlay::TextOverlay() :
+    _backgroundColor(DEFAULT_BACKGROUND_COLOR),
     _leftMargin(DEFAULT_MARGIN),
     _topMargin(DEFAULT_MARGIN),
     _fontSize(DEFAULT_FONTSIZE)
diff --git a/interface/src/ui/overlays/TextOverlay.h b/interface/src/ui/overlays/TextOverlay.h
index 6de415dcc7..6484b6a38f 100644
--- a/interface/src/ui/overlays/TextOverlay.h
+++ b/interface/src/ui/overlays/TextOverlay.h
@@ -28,6 +28,7 @@
 #include "Overlay.h"
 #include "Overlay2D.h"
 
+const xColor DEFAULT_BACKGROUND_COLOR = { 0, 0, 0 };
 const int DEFAULT_MARGIN = 10;
 const int DEFAULT_FONTSIZE = 11;