From dda048c616e16855e3897a3dd2b509d47c1cb667 Mon Sep 17 00:00:00 2001
From: "techdragon.nguyen@gmail.com"
 <techdragon.nguyen@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Wed, 25 Jan 2012 22:31:58 +0000
Subject: [PATCH] forgot to check in the JGE changes from previous commit

---
 JGE/include/JGui.h |   6 ++-
 JGE/src/JGui.cpp   | 100 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/JGE/include/JGui.h b/JGE/include/JGui.h
index 961840846..a2f8d845b 100644
--- a/JGE/include/JGui.h
+++ b/JGE/include/JGui.h
@@ -99,6 +99,8 @@ protected:
 
 public:
     vector<JGuiObject*> mObjects;
+
+    vector<JGuiObject*> mButtons;
     int mCount;
 
     JGuiController(JGE* jge, int id, JGuiListener* listener);
@@ -108,8 +110,8 @@ public:
     virtual void Update(float dt);
     virtual bool CheckUserInput(JButton key);
 
-    void Add(JGuiObject* ctrl);
-    void RemoveAt(int i);
+    void Add(JGuiObject* ctrl, bool isButton = false);
+    void RemoveAt(int i, bool isButton = false);
     void Remove(int id);
     void Remove(JGuiObject* ctrl);
 
diff --git a/JGE/src/JGui.cpp b/JGE/src/JGui.cpp
index 6c570dbec..672f976bd 100644
--- a/JGE/src/JGui.cpp
+++ b/JGE/src/JGui.cpp
@@ -78,6 +78,8 @@ JGuiController::~JGuiController()
 {
     for (int i = 0; i < mCount; i++)
         if (mObjects[i] != NULL) delete mObjects[i];
+    for (size_t i = 0; i < mButtons.size(); i++)
+        if (mButtons[i] != NULL) delete mButtons[i];
 
 }
 
@@ -156,32 +158,46 @@ bool JGuiController::CheckUserInput(JButton key)
         int n = mCurr;
         if (mEngine->GetLeftClickCoordinates(x, y))
         {
-            for (int i = 0; i < mCount; i++)
+            // first scan the buttons on the screen and then process the other gui elements
+            for (size_t i = 0; i < mButtons.size(); i++)
             {
-                float top, left;
-                if (mObjects[i]->getTopLeft(top, left))
+                if (mButtons[i]->ButtonPressed())
                 {
-                    distance2 = (top - y) * (top - y) + (left - x) * (left - x);
-                    if (distance2 < minDistance2)
-                    {
-                        minDistance2 = distance2;
-                        n = i;
-                    }
+                    mEngine->LeftClickedProcessed();
+                    return true;
                 }
             }
-
-            if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN))
+            
+            if (mObjects.size())
             {
-                mCurr = n;
-                mObjects[mCurr]->Entering();
-            }
-            // if the same object was selected process click
-            else if (n == mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_OK))
-            {
-                mObjects[mCurr]->Entering();
+                for (int i = 0; i < mCount; i++)
+                {
+                    float top, left;
+                    if (mObjects[i]->getTopLeft(top, left))
+                    {
+                        distance2 = (top - y) * (top - y) + (left - x) * (left - x);
+                        if (distance2 < minDistance2)
+                        {
+                            minDistance2 = distance2;
+                            n = i;
+                        }
+                    }
+                }
+                
+                if (n != mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_DOWN))
+                {
+                    mCurr = n;
+                    mObjects[mCurr]->Entering();
+                }
+                // if the same object was selected process click
+                else if (n == mCurr && mObjects[mCurr] != NULL && mObjects[mCurr]->Leaving(JGE_BTN_OK))
+                {
+                    mObjects[mCurr]->Entering();
+                }
+                mEngine->LeftClickedProcessed();
+                return true;
             }
             mEngine->LeftClickedProcessed();
-            return true;
         }
     }
     return false;
@@ -192,6 +208,9 @@ void JGuiController::Update(float dt)
     for (int i = 0; i < mCount; i++)
         if (mObjects[i] != NULL)
             mObjects[i]->Update(dt);
+    
+    for (size_t i = 0; i < mButtons.size(); i++ )
+        mButtons[i]->Update(dt);
 
     if(mEngine)
     {
@@ -200,14 +219,30 @@ void JGuiController::Update(float dt)
     }
 }
 
-void JGuiController::Add(JGuiObject* ctrl)
+void JGuiController::Add(JGuiObject* ctrl, bool isButton)
 {
-    mObjects.push_back(ctrl);
-    mCount++;
+    if (!isButton)
+    {
+        mObjects.push_back(ctrl);
+        mCount++;
+    }
+    else
+    {
+        mButtons.push_back(ctrl);
+    }
 }
 
-void JGuiController::RemoveAt(int i)
+void JGuiController::RemoveAt(int i, bool isButton)
 {
+    if (isButton)
+    {
+        if (!mButtons[i]) return;
+        mButtons.erase(mButtons.begin() + i);
+        delete mButtons[i];
+        
+        return;
+    }
+    
     if (!mObjects[i]) return;
     mObjects.erase(mObjects.begin() + i);
     delete mObjects[i];
@@ -226,6 +261,15 @@ void JGuiController::Remove(int id)
             return;
         }
     }
+    
+    for (size_t i = 0; i < mButtons.size(); i++)
+    {
+        if (mButtons[i] != NULL && mButtons[i]->GetId() == id)
+        {
+            RemoveAt(i, true);
+            return;
+        }
+    }
 }
 
 void JGuiController::Remove(JGuiObject* ctrl)
@@ -238,6 +282,16 @@ void JGuiController::Remove(JGuiObject* ctrl)
             return;
         }
     }
+
+    
+    for (size_t i = 0; i < mButtons.size(); i++)
+    {
+        if (mButtons[i] != NULL && mButtons[i] == ctrl)
+        {
+            RemoveAt(i, true);
+            return;
+        }
+    }
 }
 
 void JGuiController::SetActionButton(JButton button)