[Scummvm-cvs-logs] CVS: scummvm/gui chooser.cpp,1.16,1.17
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Fri Jun 3 05:22:51 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui browser.cpp,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.59,1.60 launcher.cpp,1.124,1.125 message.cpp,1.27,1.28 options.cpp,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4557
Modified Files:
chooser.cpp
Log Message:
Cleanup.
Index: chooser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/chooser.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chooser.cpp 20 May 2005 15:59:29 -0000 1.16
+++ chooser.cpp 3 Jun 2005 12:21:52 -0000 1.17
@@ -35,25 +35,20 @@
const int screenW = g_system->getOverlayWidth();
const int screenH = g_system->getOverlayHeight();
- const Graphics::Font *font;
GUI::WidgetSize ws;
int buttonWidth, buttonHeight;
if (screenW >= 400 && screenH >= 300) {
ws = GUI::kBigWidgetSize;
- font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont);
buttonHeight = kBigButtonHeight;
buttonWidth = kBigButtonWidth;
} else {
ws = GUI::kNormalWidgetSize;
- font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
buttonHeight = kButtonHeight;
buttonWidth = kButtonWidth;
}
- int lineHeight = font->getFontHeight() + 2;
-
// FIXME: This is an ugly hack. The 'height' parameter assumes a 200
// pixel tall screen, so try to scale that to something sensible.
@@ -66,9 +61,9 @@
int yoffset = 6;
// Headline
- new StaticTextWidget(this, 10, 6, _w - 2 * 10, lineHeight, title, kTextAlignCenter, ws);
+ new StaticTextWidget(this, 10, 6, _w - 2 * 10, kLineHeight, title, kTextAlignCenter, ws);
- yoffset += lineHeight + 2;
+ yoffset += kLineHeight + 2;
// Add choice list
// HACK: Subtracting -12 from the height makes the list look good when
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gui browser.cpp,1.31,1.32
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui dialog.cpp,1.59,1.60 launcher.cpp,1.124,1.125 message.cpp,1.27,1.28 options.cpp,1.89,1.90
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list