From 7d623bb99d757863e5098fcad5c2c22ef6ed1275 Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Fri, 13 Apr 2018 14:14:35 -0700
Subject: [PATCH] Added Over and Out options on text buttons

---
 TextButtonInstance.cpp | 11 +++++++++++
 TextButtonInstance.h   | 13 +++++++++++++
 main.cpp               |  9 ++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp
index d191ec1..69b405b 100644
--- a/TextButtonInstance.cpp
+++ b/TextButtonInstance.cpp
@@ -6,9 +6,18 @@ Color4 textColor;
 Color4 textOutlineColor;
 Color4 boxColor;
 Color4 boxOutlineColor;
+Color4 textColorOvr;
+Color4 textOutlineColorOvr;
+Color4 boxColorOvr;
+Color4 boxOutlineColorOvr;
+Color4 textColorDn;
+Color4 textOutlineColorDn;
+Color4 boxColorDn;
+Color4 boxOutlineColorDn;
 bool centeredWithinBox;
 std::string title;
 G3D::GFontRef font;
+int textSize;
 
 
 TextButtonInstance::TextButtonInstance(void)
@@ -22,6 +31,8 @@ TextButtonInstance::TextButtonInstance(void)
 	textOutlineColor = Color4(0, 0, 0, 0);
 	boxColor = Color4(0.6F,0.6F,0.6F,0.4F);
 	boxOutlineColor = Color4(0, 0, 0, 0);
+	textSize = 12;
+	
 }
 
 TextButtonInstance::~TextButtonInstance(void)
diff --git a/TextButtonInstance.h b/TextButtonInstance.h
index d7dbf88..f606862 100644
--- a/TextButtonInstance.h
+++ b/TextButtonInstance.h
@@ -10,6 +10,19 @@ public:
 	Vector2 boxBegin;
 	Vector2 boxEnd;
 	Vector2 fontLocationRelativeTo;
+	Color4 textColor;
+	Color4 textOutlineColor;
+	Color4 boxColor;
+	Color4 boxOutlineColor;
+	Color4 textColorOvr;
+	Color4 textOutlineColorOvr;
+	Color4 boxColorOvr;
+	Color4 boxOutlineColorOvr;
+	Color4 textColorDn;
+	Color4 textOutlineColorDn;
+	Color4 boxColorDn;
+	Color4 boxOutlineColorDn;
 	bool centeredWithinBox;
 	std::string title;
+	G3D::GFontRef font;
 };
diff --git a/main.cpp b/main.cpp
index e71d808..23aa7dc 100644
--- a/main.cpp
+++ b/main.cpp
@@ -235,6 +235,11 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) {
 }
 
 
+void readMouseGUIInput()
+{
+	
+}
+
 void Demo::onUserInput(UserInput* ui) {
     if (ui->keyPressed(SDLK_ESCAPE)) {
         // Even when we aren't in debug mode, quit on escape.
@@ -299,10 +304,12 @@ void Demo::onUserInput(UserInput* ui) {
 		message = "FPS has been set to " + Convert(FPSVal[index]);
 		setDesiredFrameRate(FPSVal[index]);
 	}
-
+	readMouseGUIInput();
 	// Add other key handling here
 }
 
+
+
 std::string ExePath() {
     char buffer[MAX_PATH];
     GetModuleFileName( NULL, buffer, MAX_PATH );