Let the deck view base class handle buttons

projects/mtg/include/CarouselDeckView.h

@@ -31,7 +31,9 @@ public:
     void Render();
 
     MTGCard * Click(int x, int y);
-    bool Button(Buttons button);
+
+    void changePosition(int offset);
+    void changeFilter(int offset);
 
     MTGCard *getActiveCard();
 

projects/mtg/include/DeckView.h

@@ -39,8 +39,10 @@ public:
 
     virtual void Render() = 0;
     virtual MTGCard * Click(int x, int y) = 0;
-    virtual bool Button(Buttons button) = 0;
+    bool Button(Buttons button);
     virtual MTGCard *getActiveCard() = 0;
+    virtual void changePosition(int offset) = 0;
+    virtual void changeFilter(int offset) = 0;
 
     virtual void SetDeck(DeckDataWrapper *toShow);
     DeckDataWrapper *deck();

projects/mtg/include/GridDeckView.h

@@ -20,7 +20,10 @@ public:
 
     void Render();
     MTGCard * Click(int x, int y);
-    bool Button(Buttons button);
+
+    void changePosition(int offset);
+    void changeFilter(int offset);
+
     MTGCard *getActiveCard();
 private:
     int   mCols;

projects/mtg/src/CarouselDeckView.cpp

@@ -147,34 +147,30 @@ MTGCard * CarouselDeckView::Click(int x, int y)
     return NULL;
 }
 
-bool CarouselDeckView::Button(Buttons button)
+void CarouselDeckView::changePosition(int offset)
 {
-    switch(button)
+    if(offset > 0){
-    {
-    case JGE_BTN_LEFT:
-        mScrollTarget -= 1;
-        mStage = SCROLL_TO_SELECTED;
-        last_user_activity = 0;
-        break;
-    case JGE_BTN_RIGHT:
         mScrollTarget += 1;
         mStage = SCROLL_TO_SELECTED;
-        last_user_activity = 0;
+    }else if(offset < 0){
-        break;
+        mScrollTarget -= 1;
-    case JGE_BTN_UP:
+        mStage = SCROLL_TO_SELECTED;
+    }
+
+    last_user_activity = 0;
+}
+
+void CarouselDeckView::changeFilter(int offset)
+{
+    if(offset > 0){
         mStage = SLIDE_UP;
         SwitchFilter(1);
-        last_user_activity = 0;
+    } else if(offset < 0){
-        break;
-    case JGE_BTN_DOWN:
         mStage = SLIDE_DOWN;
         SwitchFilter(-1);
-        last_user_activity = 0;
-        break;
-    default:
-        return false;
     }
-    return true;
+
+    last_user_activity = 0;
 }
 
 MTGCard *CarouselDeckView::getActiveCard()

projects/mtg/src/DeckView.cpp

@@ -42,6 +42,32 @@ void DeckView::Update(float dt)
     }
 }
 
+bool DeckView::Button(Buttons button)
+{
+    switch(button)
+    {
+    case JGE_BTN_LEFT:
+        changePosition(-1);
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_RIGHT:
+        changePosition(1);
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_UP:
+        changeFilter(1);
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_DOWN:
+        changeFilter(-1);
+        last_user_activity = 0;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
 void DeckView::SetDeck(DeckDataWrapper *toShow)
 {
     mCurrentDeck = toShow;

projects/mtg/src/GameStateDeckViewer.cpp

@@ -1536,26 +1536,13 @@ void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity)
     {
         if(abs(inXVelocity) > 300)
         {
-            //determine how many cards to move, the faster the velocity the more cards to move.
+            //FIXME: this 500 is a bit arbitrary
-            // the display is setup so that there is a max of 2 cards to the left and 7 cards to the right
-            // of the current card.
             int numCards = (magnitude / 500) % 8;
-            int offset = 0;
+            mView->changePosition(flickRight ? numCards : - numCards);
-            if ( (numCards == 0) && magnitude) numCards = 7;
-            if ( !flickRight)
-            {
-                if (numCards > 1)
-                    offset = 0;
-            }
-            else
-                offset = 2 + numCards;
-
-            //TODO: FIXME
-            //mEngine->LeftClickedProcessed();
-            //mEngine->LeftClicked(static_cast<int>(cardsCoordinates[offset].first), static_cast<int>(cardsCoordinates[offset].second));
-            //mEngine->HoldKey_NoRepeat(JGE_BTN_OK);
         }
     }
     else
-        mEngine->HoldKey_NoRepeat(flickUp ? JGE_BTN_UP : JGE_BTN_DOWN);
+        mView->changeFilter(flickUp ? 1 : -1);
+
+    last_user_activity = 0;
 }

projects/mtg/src/GridDeckView.cpp

@@ -141,30 +141,24 @@ MTGCard * GridDeckView::Click(int x, int y)
     return NULL;
 }
 
-bool GridDeckView::Button(Buttons button)
+void GridDeckView::changePosition(int offset)
 {
-    switch(button)
+    if(offset < 0){
-    {
-    case JGE_BTN_RIGHT:
-        mScrollOffset.start(-1.0f, 0.3f);
-        last_user_activity = 0;
-        break;
-    case JGE_BTN_LEFT:
         mScrollOffset.start( 1.0f, 0.3f);
-        last_user_activity = 0;
+    }else if(offset > 0){
-        break;
+        mScrollOffset.start(-1.0f, 0.3f);
-    case JGE_BTN_UP:
-        mSlide.start(2.0f, 0.3f);
-        last_user_activity = 0;
-        break;
-    case JGE_BTN_DOWN:
-        mSlide.start(-2.0f, 0.3f);
-        last_user_activity = 0;
-        break;
-    default:
-        return false;
     }
-    return true;
+    last_user_activity = 0;
+}
+
+void GridDeckView::changeFilter(int offset)
+{
+    if(offset < 0){
+        mSlide.start(-2.0f, 0.3f);
+    }else if(offset > 0){
+        mSlide.start(2.0f, 0.3f);
+    }
+    last_user_activity = 0;
 }
 
 MTGCard* GridDeckView::getActiveCard()