From 941c1965002f114c6612dad6fc3f35d48261baff Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sat, 16 Apr 2016 13:55:31 -0400
Subject: action menu?

---
 include/ui_menu.hpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'include/ui_menu.hpp')

diff --git a/include/ui_menu.hpp b/include/ui_menu.hpp
index bfeecba..621676a 100644
--- a/include/ui_menu.hpp
+++ b/include/ui_menu.hpp
@@ -3,6 +3,7 @@
 
 #include <common.hpp>
 #include <config.hpp>
+#include <ui.hpp>
 
 typedef void (*menuFunc)(void);
 
@@ -13,7 +14,7 @@ struct menuItem {
 			vec2 loc;
 			dim2 dim;
 			Color color;
-            
+
 			const char *text;
 			menuFunc func;
 		} button;
@@ -21,11 +22,11 @@ struct menuItem {
 			vec2 loc;
 			dim2 dim;
 			Color color;
-            
+
 			float minValue;
 			float maxValue;
             float sliderLoc;
-            
+
 			const char *text;
 			float *var;
 		} slider;
@@ -36,7 +37,7 @@ class Menu {
 public:
 	std::vector<menuItem> items;
 	Menu *child, *parent;
-    
+
 	~Menu() {
         // TODO you CANNOT delete null pointers!
 		/*child = NULL;
@@ -55,7 +56,7 @@ namespace ui {
         menuItem createChildButton(vec2 l, dim2 d, Color c, const char* t);
         menuItem createParentButton(vec2 l, dim2 d, Color c, const char* t);
         menuItem createSlider(vec2 l, dim2 d, Color c, float min, float max, const char* t, float* v);
-        
+
         void draw(void);
     }
 }
-- 
cgit v1.2.3