diff --git a/source/images/sdcard.png b/source/images/sdcard.png index a0c6b2a5..c4fdc62d 100644 Binary files a/source/images/sdcard.png and b/source/images/sdcard.png differ 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);