From 4db969442c2afb361b168dd8bcf6f535be3fba66 Mon Sep 17 00:00:00 2001 From: thedarkness1981 Date: Tue, 5 May 2009 01:35:41 +0000 Subject: [PATCH] =?UTF-8?q?Fixed=20CreditW=C3=ADndow,=20changed=20sdcard?= =?UTF-8?q?=20logo=20size?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/images/sdcard.png | Bin 5520 -> 5213 bytes source/libwiigui/gui_text.cpp | 12 ++++++++---- source/menu.cpp | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/source/images/sdcard.png b/source/images/sdcard.png index a0c6b2a58c9fc1eca05b53eed13123566b97059e..c4fdc62d1f003051113c81a409372321838483a3 100644 GIT binary patch delta 2524 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 diff --git a/source/libwiigui/gui_text.cpp b/source/libwiigui/gui_text.cpp index 10012510..fd9314b2 100644 --- a/source/libwiigui/gui_text.cpp +++ b/source/libwiigui/gui_text.cpp @@ -168,7 +168,8 @@ void GuiText::Draw() if(newSize != currentSize) { - (font ? font : fontSystem)->changeSize(newSize); + fontSystem->changeSize(newSize); + //(font ? font : fontSystem)->changeSize(newSize); currentSize = newSize; } @@ -198,7 +199,8 @@ void GuiText::Draw() if(text[ch] == ' ' || ch == strlen-1) { - if((font ? font : fontSystem)->getWidth(tmptext[linenum]) >= maxWidth) + //if((font ? font : fontSystem)->getWidth(tmptext[linenum]) >= maxWidth) + if(fontSystem->getWidth(tmptext[linenum]) >= maxWidth) { if(lastSpace >= 0) { @@ -229,13 +231,15 @@ void GuiText::Draw() for(i=0; i < linenum; i++) { - (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style); + //(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style); + fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset+i*lineheight, tmptext[i], c, style); delete tmptext[i]; } } else { - (font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style); + //(font ? font : fontSystem)->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style); + fontSystem->drawText(this->GetLeft(), this->GetTop()+voffset, text, c, style); } this->UpdateEffects(); } diff --git a/source/menu.cpp b/source/menu.cpp index 4d825f27..c78bb90e 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -1445,7 +1445,7 @@ ProgressWindow(const char *title, const char *msg) prTxt.SetPosition(0, 40); timeTxt.SetAlignment(ALIGN_CENTRE, ALIGN_BOTTOM); - timeTxt.SetPosition(0,-30); + timeTxt.SetPosition(0,-50); promptWindow.Append(&dialogBoxImg); promptWindow.Append(&titleTxt);