Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan - reverting r2779 per my comment in that revision

Browse Source
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-12-08 14:18:41 +00:00
parent 2a442ad2f5
commit 70a1a03fee
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/graphics/DeckMenuBackdrop.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

projects/mtg/bin/Res/graphics/DeckMenuBackdrop.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

projects/mtg/src/DeckMenu.cpp
+3 -3
View File
@@ -102,7 +102,7 @@ JGuiController(id, listener), fontId(fontId), mShowDetailsScreen( showDetailsOve
void DeckMenu::RenderBackground() void DeckMenu::RenderBackground()
{ {
ostringstream bgFilename; ostringstream bgFilename;
bgFilename << backgroundName << ".jpg"; bgFilename << backgroundName << ".png";
static bool loadBackground = true; static bool loadBackground = true;
if (loadBackground) if (loadBackground)
@@ -178,8 +178,6 @@ void DeckMenu::Render()
} }
if (timeOpen < 1) height *= timeOpen > 0 ? timeOpen : -timeOpen; if (timeOpen < 1) height *= timeOpen > 0 ? timeOpen : -timeOpen;
RenderBackground();
for (int i = startId; i < startId + maxItems; i++) for (int i = startId; i < startId + maxItems; i++)
{ {
if (i > mCount - 1) break; if (i > mCount - 1) break;
@@ -200,6 +198,7 @@ void DeckMenu::Render()
float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str()); float stringWidth = mainFont->GetStringWidth(detailedInfoString.c_str());
float boxStartX = detailedInfoBoxX - stringWidth / 2; float boxStartX = detailedInfoBoxX - stringWidth / 2;
DWORD currentColor = mainFont->GetColor(); DWORD currentColor = mainFont->GetColor();
renderer->FillRoundRect( boxStartX, detailedInfoBoxY - 5, stringWidth, mainFont->GetHeight() + 15, .5, ARGB( 255, 0, 0, 0) );
renderer->RenderQuad(pspIcons[5], detailedInfoBoxX, detailedInfoBoxY + 2, 0, pspIconsSize, pspIconsSize); renderer->RenderQuad(pspIcons[5], detailedInfoBoxX, detailedInfoBoxY + 2, 0, pspIconsSize, pspIconsSize);
mainFont->SetColor(currentColor); mainFont->SetColor(currentColor);
mainFont->DrawString(detailedInfoString, boxStartX, detailedInfoBoxY + 10); mainFont->DrawString(detailedInfoString, boxStartX, detailedInfoBoxY + 10);
@@ -241,6 +240,7 @@ void DeckMenu::Render()
} }
mScroller->Render(); mScroller->Render();
RenderBackground();
renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE); renderer->SetTexBlend(BLEND_SRC_ALPHA, BLEND_ONE);
stars->Render(); stars->Render();