From 718ceca9191aed3988e2db26436f64e4740331b4 Mon Sep 17 00:00:00 2001
From: Tobias Loose <TobiasLoose@gmx.de>
Date: Sun, 8 Dec 2013 22:43:03 +0100
Subject: [PATCH] Do not allow that the selection moves outside in grid view.

---
 projects/mtg/src/GameStateDeckViewer.cpp | 3 +--
 projects/mtg/src/GridDeckView.cpp        | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index fe97ee11f..90ced365f 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -407,9 +407,8 @@ void GameStateDeckViewer::Update(float dt)
         case JGE_BTN_RIGHT:
         case JGE_BTN_UP:
         case JGE_BTN_DOWN:
-            if(last_user_activity > 0.2)
+            if(mView->ButtonPressed(button))
             {
-                mView->ButtonPressed(button);
                 last_user_activity = 0;
                 mStage = STAGE_WAITING;
             }
diff --git a/projects/mtg/src/GridDeckView.cpp b/projects/mtg/src/GridDeckView.cpp
index 922273dd6..36fb9ee4f 100644
--- a/projects/mtg/src/GridDeckView.cpp
+++ b/projects/mtg/src/GridDeckView.cpp
@@ -147,22 +147,22 @@ bool GridDeckView::ButtonPressed(Buttons button)
     switch(button)
     {
     case JGE_BTN_LEFT:
-        if(mButtonMode) moveSelection(-2, true);
+        if(mButtonMode && mScrollEasing.finished()) moveSelection(-2, true);
         else changePositionAnimated(-1);
         last_user_activity = 0;
         break;
     case JGE_BTN_RIGHT:
-        if(mButtonMode) moveSelection(2, true);
+        if(mButtonMode && mScrollEasing.finished()) moveSelection(2, true);
         else changePositionAnimated(1);
         last_user_activity = 0;
         break;
     case JGE_BTN_UP:
-        if(mButtonMode) moveSelection(-1, true);
+        if(mButtonMode && mScrollEasing.finished()) moveSelection(-1, true);
         else changeFilterAnimated(1);
         last_user_activity = 0;
         break;
     case JGE_BTN_DOWN:
-        if(mButtonMode) moveSelection(1, true);
+        if(mButtonMode && mScrollEasing.finished()) moveSelection(1, true);
         else changeFilterAnimated(-1);
         last_user_activity = 0;
         break;