From 85451f69ee8c7bd88c88e5920da3571bfb00cc26 Mon Sep 17 00:00:00 2001
From: "techdragon.nguyen@gmail.com"
 <techdragon.nguyen@gmail.com@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Thu, 26 Jan 2012 14:54:07 +0000
Subject: [PATCH] vs 2010 update for deck editor changes as well as SDL update

---
 projects/mtg/src/GameStateDeckViewer.cpp |  2 +-
 projects/mtg/src/InteractiveButton.cpp   |  4 ++--
 projects/mtg/template.vcxproj            |  6 +++++-
 projects/mtg/template.vcxproj.filters    | 14 +++++++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp
index a7d0e3eb6..43e25bf6e 100644
--- a/projects/mtg/src/GameStateDeckViewer.cpp
+++ b/projects/mtg/src/GameStateDeckViewer.cpp
@@ -1766,7 +1766,7 @@ void GameStateDeckViewer::OnScroll(int inXVelocity, int inYVelocity, int magnitu
                 offset = 2 + numCards;
             
             mEngine->LeftClickedProcessed();
-            mEngine->LeftClicked(cardsCoordinates[offset].first, cardsCoordinates[offset].second);
+            mEngine->LeftClicked(static_cast<int>(cardsCoordinates[offset].first), static_cast<int>(cardsCoordinates[offset].second));
             mEngine->HoldKey_NoRepeat(JGE_BTN_OK);
         }
         else
diff --git a/projects/mtg/src/InteractiveButton.cpp b/projects/mtg/src/InteractiveButton.cpp
index a2cb79833..0379ce2bc 100644
--- a/projects/mtg/src/InteractiveButton.cpp
+++ b/projects/mtg/src/InteractiveButton.cpp
@@ -68,9 +68,9 @@ void InteractiveButton::Render()
     float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str());
     DWORD currentColor = mainFont->GetColor();
 #ifndef TOUCH_ENABLED
-    mXOffset = stringWidth / 2;
+    mXOffset = 5;
     mYOffset = 10;
-    float boxStartX = getX() - mXOffset;
+    float boxStartX = getX() - 5;
     float pspIconsSize = 0.5;
     renderer->FillRoundRect( boxStartX, getY() - 5, stringWidth, mainFont->GetHeight() + 15, .5, ARGB( 255, 0, 0, 0) );
     if (buttonImage != NULL)
diff --git a/projects/mtg/template.vcxproj b/projects/mtg/template.vcxproj
index 8d7052691..b06862787 100644
--- a/projects/mtg/template.vcxproj
+++ b/projects/mtg/template.vcxproj
@@ -375,6 +375,7 @@
     <ClCompile Include="src\GuiPlay.cpp" />
     <ClCompile Include="src\GuiStatic.cpp" />
     <ClCompile Include="src\IconButton.cpp" />
+    <ClCompile Include="src\InteractiveButton.cpp" /> 
     <ClCompile Include="src\ManaCost.cpp" />
     <ClCompile Include="src\ManaCostHybrid.cpp" />
     <ClCompile Include="src\MenuItem.cpp" />
@@ -408,6 +409,7 @@
     <ClCompile Include="src\PriceList.cpp" />
     <ClCompile Include="src\ReplacementEffects.cpp" />
     <ClCompile Include="src\Rules.cpp" />
+    <ClCompile Include="src\SimpleButton.cpp" />
     <ClCompile Include="src\SimpleMenu.cpp" />
     <ClCompile Include="src\SimpleMenuItem.cpp" />
     <ClCompile Include="src\SimplePad.cpp" />
@@ -497,6 +499,7 @@
     <ClInclude Include="include\GuiPlay.h" />
     <ClInclude Include="include\GuiStatic.h" />
     <ClInclude Include="include\IconButton.h" />
+    <ClInclude Include="include\InteractiveButton.h"/>
     <ClInclude Include="include\Manacost.h" />
     <ClInclude Include="include\ManaCostHybrid.h" />
     <ClInclude Include="include\MenuItem.h" />
@@ -525,6 +528,7 @@
     <ClInclude Include="include\PriceList.h" />
     <ClInclude Include="include\ReplacementEffects.h" />
     <ClInclude Include="include\Rules.h" />
+    <ClInclude Include="include\SimpleButton.h" />
     <ClInclude Include="include\SimpleMenu.h" />
     <ClInclude Include="include\SimpleMenuItem.h" />
     <ClInclude Include="include\SimplePad.h" />
@@ -567,4 +571,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/projects/mtg/template.vcxproj.filters b/projects/mtg/template.vcxproj.filters
index 1c1f12cb3..d4e1ebe09 100644
--- a/projects/mtg/template.vcxproj.filters
+++ b/projects/mtg/template.vcxproj.filters
@@ -322,6 +322,12 @@
     <ClCompile Include="src\AbilityParser.cpp">
       <Filter>src</Filter>
     </ClCompile>
+     <ClCompile Include="src\InteractiveButton.cpp">
+       <Filter>src</Filter>
+     </ClCompile>
+     <ClCompile Include="src\SimpleButton.cpp">
+       <Filter>src</Filter>
+     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\ActionElement.h">
@@ -660,6 +666,12 @@
     <ClInclude Include="include\IconButton.h">
       <Filter>inc</Filter>
     </ClInclude>
+    <ClInclude Include="include\InteractiveButton.h">
+      <Filter>inc</Filter>
+    </ClInclude>
+    <ClInclude Include="include\SimpleButton.h">
+      <Filter>inc</Filter>
+    </ClInclude>
     <ClInclude Include="include\AIPlayerBaka.h">
       <Filter>inc</Filter>
     </ClInclude>
@@ -692,4 +704,4 @@
       <Filter>res</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>