diff options
| author | Max Horn | 2005-05-11 19:31:23 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-11 19:31:23 +0000 |
| commit | cccbb52e1e5d4e972d7d2974d33034507dc772b4 (patch) | |
| tree | 180ae655ab5dd4618b359b7f86c6ac1b260dbe24 /gui | |
| parent | 79241d323fec0299e55bbfb420d0b4cdb4a70965 (diff) | |
| download | scummvm-rg350-cccbb52e1e5d4e972d7d2974d33034507dc772b4.tar.gz scummvm-rg350-cccbb52e1e5d4e972d7d2974d33034507dc772b4.tar.bz2 scummvm-rg350-cccbb52e1e5d4e972d7d2974d33034507dc772b4.zip | |
Do not autoscale about dialog, rather let it scale itself properly
svn-id: r18061
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/about.cpp | 12 | ||||
| -rw-r--r-- | gui/about.h | 8 |
2 files changed, 18 insertions, 2 deletions
diff --git a/gui/about.cpp b/gui/about.cpp index 6312cb0bcd..7e1b267654 100644 --- a/gui/about.cpp +++ b/gui/about.cpp @@ -88,7 +88,15 @@ AboutDialog::AboutDialog() int i; - _lineHeight = g_gui.getFontHeight() + 3; + _w = g_system->getOverlayWidth() - 2 * 10; + _h = g_system->getOverlayHeight() - 20 - 16; + + if (_w < 450) + _font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont); + else + _font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont); + + _lineHeight = _font->getFontHeight() + 3; for (i = 0; i < 1; i++) _lines.push_back(""); @@ -199,7 +207,7 @@ void AboutDialog::drawDialog() { while (*str && *str == ' ') str++; - g_gui.drawString(str, _x + kXOff, y, _w - 2 * kXOff, color, align); + _font->drawString(&g_gui.getScreen(), str, _x + kXOff, y, _w - 2 * kXOff, color, align); y += _lineHeight; } diff --git a/gui/about.h b/gui/about.h index 65dbb49f40..35eb34a710 100644 --- a/gui/about.h +++ b/gui/about.h @@ -25,6 +25,10 @@ #include "common/str.h" #include "graphics/surface.h" +namespace Graphics { + class Font; +} + namespace GUI { class AboutDialog : public Dialog { @@ -37,6 +41,7 @@ protected: byte _modifiers; bool _willClose; Graphics::Surface _canvas; + const Graphics::Font *_font; public: AboutDialog(); @@ -49,6 +54,9 @@ public: void handleMouseUp(int x, int y, int button, int clickCount); void handleKeyDown(uint16 ascii, int keycode, int modifiers); void handleKeyUp(uint16 ascii, int keycode, int modifiers); + + // disable scaling + bool wantsScaling() const { return false; } }; } // End of namespace GUI |