From 40208c4835c3e00c41ba827e8d3d6e9b08d00b49 Mon Sep 17 00:00:00 2001 From: Xawotihs Date: Fri, 3 Jun 2011 20:01:50 +0000 Subject: [PATCH] Fixed issue 674 for deck selection in menu by mouse/touch --- projects/mtg/include/DeckMenuItem.h | 3 ++- projects/mtg/src/DeckMenuItem.cpp | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/mtg/include/DeckMenuItem.h b/projects/mtg/include/DeckMenuItem.h index 7c30bf45f..fb2810cc9 100644 --- a/projects/mtg/include/DeckMenuItem.h +++ b/projects/mtg/include/DeckMenuItem.h @@ -19,6 +19,7 @@ private: int fontId; string mText; float mTitleResetWidth; + static float mYOffset; public: string imageFilename; @@ -53,7 +54,7 @@ public: virtual ostream& toString(ostream& out) const; virtual bool getTopLeft(float& top, float& left) { - top = mY; + top = mY + mYOffset; left = mX; return true; } diff --git a/projects/mtg/src/DeckMenuItem.cpp b/projects/mtg/src/DeckMenuItem.cpp index 8c1e087ff..cc124b4bd 100644 --- a/projects/mtg/src/DeckMenuItem.cpp +++ b/projects/mtg/src/DeckMenuItem.cpp @@ -9,6 +9,8 @@ const int kHorizontalScrollSpeed = 30; // higher numbers mean faster scrolling +float DeckMenuItem::mYOffset = 0; + DeckMenuItem::DeckMenuItem(DeckMenu* _parent, int id, int fontId, string text, float x, float y, bool hasFocus, bool autoTranslate, DeckMetaData *deckMetaData) : JGuiObject(id), parent(_parent), fontId(fontId), mX(x), mY(y) { @@ -80,6 +82,8 @@ void DeckMenuItem::Update(float dt) void DeckMenuItem::RenderWithOffset(float yOffset) { + mYOffset = yOffset; + WFont * mFont = WResourceManager::Instance()->GetWFont(fontId); if (!( mHasFocus && mScrollEnabled ))