From 865bc7e4941ba483dfc6f468944efc36dcaa27bb Mon Sep 17 00:00:00 2001
From: "techdragon.nguyen@gmail.com"
 <techdragon.nguyen@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Tue, 20 Mar 2012 23:07:21 +0000
Subject: [PATCH] resolved scrolling issue (Issue 801) in filters list.  it's a
 little verbose, but it seems to work.  need to see if we can't refactor
 CheckUserInput to reduce the amount of code duplication.  The logic for
 SimpleMenu is slightly different from the base method.  perhaps we should
 override CheckUserInput to take in two parameters instead of one.

---
 projects/mtg/include/SimpleMenu.h |  1 +
 projects/mtg/src/SimpleMenu.cpp   | 67 ++++++++++++++++++++++++++++++-
 projects/mtg/src/WGui.cpp         |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/projects/mtg/include/SimpleMenu.h b/projects/mtg/include/SimpleMenu.h
index 320043cbd..ac02397bc 100644
--- a/projects/mtg/include/SimpleMenu.h
+++ b/projects/mtg/include/SimpleMenu.h
@@ -40,6 +40,7 @@ public:
     SimpleMenu(JGE*, int id, JGuiListener* listener, int fontId, float x, float y, const char * _title = "", int _maxItems = 7, bool centerHorizontal = true, bool centerVertical = true);
     virtual ~SimpleMenu();
     virtual void Render();
+    virtual bool CheckUserInput(JButton key);
     virtual void Update(float dt);
     virtual void Add(int id, const char * Text, string desc = "", bool forceFocus = false);
     int getmCurr(){return mCurr;}
diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp
index e31ca1bed..d75947186 100644
--- a/projects/mtg/src/SimpleMenu.cpp
+++ b/projects/mtg/src/SimpleMenu.cpp
@@ -101,7 +101,6 @@ void SimpleMenu::drawVertPole(float x, float y, float height)
 {
     JRenderer* renderer = JRenderer::GetInstance();
 
-
     float xOffset = (spadeR->mWidth - kPoleWidth) / 2;
     float topYOffset = xOffset;
     float bottomYOffset = xOffset;
@@ -213,12 +212,78 @@ void SimpleMenu::Render()
     mFont->SetScale(SCALE_NORMAL);
 }
 
+bool SimpleMenu::CheckUserInput(JButton key)
+{
+    // a dude may have clicked somewhere, we're gonna select the closest object from where he clicked
+    int x = -1, y = -1;
+    unsigned int distance2;
+    unsigned int minDistance2 = -1;
+    int n = mCurr;
+    
+    if ((key == JGE_BTN_NONE) && mEngine->GetLeftClickCoordinates(x, y))
+    {
+
+        // first scan the buttons on the screen and then process the other gui elements
+        for (size_t i = 0; i < mButtons.size(); i++)
+        {
+            if (mButtons[i]->ButtonPressed())
+            {
+                mEngine->LeftClickedProcessed();
+                return true;
+            }
+        }
+        
+        if (mObjects.size())
+        {
+            float top, left;
+            
+            for (int i = 0; i < mCount; i++)
+            {
+                if (mObjects[i]->getTopLeft(top, left))
+                {
+                    distance2 = (top - y) * (top - y) + (left - x) * (left - x);
+                    if ( (distance2 < minDistance2) )
+                    {
+                        minDistance2 = distance2;
+                        n = i;
+                    }
+                    else if (y > mHeight) // this will scroll downwards in a list.  
+                    {
+                        n =  mCurr + 1;
+                    }
+                }   
+            }
+            
+            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();
+            mEngine->ResetInput();
+            return true;
+        }
+        mEngine->LeftClickedProcessed();
+    }
+    else
+        return JGuiController::CheckUserInput(key);
+    
+    return false;
+}
+
+
 void SimpleMenu::Update(float dt)
 {
     JGuiController::Update(dt);
     if (mCurr > startId + maxItems - 1)
         startId = mCurr - maxItems + 1;
     else if (mCurr < startId) startId = mCurr;
+ 
     stars->Update(dt);
     selectionT += 3 * dt;
     selectionY += (selectionTargetY - selectionY) * 8 * dt;
diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp
index 21a18d2bd..c98ff90b1 100644
--- a/projects/mtg/src/WGui.cpp
+++ b/projects/mtg/src/WGui.cpp
@@ -1854,6 +1854,7 @@ void WGuiFilters::Render()
 bool WGuiFilters::CheckUserInput(JButton key)
 {
     if (subMenu && !subMenu->isClosed() && subMenu->CheckUserInput(key)) return true;
+    
     if (key == JGE_BTN_SEC)
     {//|| key == JGE_BTN_MENU){
         //TODO Pop up a "Are you sure?" dialog.