[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.144,1.145 dialogs.h,1.54,1.55
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Fri Jun 3 05:52:26 CEST 2005
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.115,1.116 newgui.h,1.60,1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21666
Modified Files:
dialogs.cpp dialogs.h
Log Message:
Cleanup.
Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- dialogs.cpp 2 Jun 2005 12:29:01 -0000 1.144
+++ dialogs.cpp 3 Jun 2005 12:51:37 -0000 1.145
@@ -670,12 +670,10 @@
const int screenW = g_system->getOverlayWidth();
const int screenH = g_system->getOverlayHeight();
- const Graphics::Font *font;
GUI::WidgetSize ws;
int buttonHeight;
int buttonWidth;
- int lineHeight;
if (screenW >= 400 && screenH >= 300) {
ws = GUI::kBigWidgetSize;
@@ -683,18 +681,16 @@
buttonWidth = kBigButtonWidth;
_w = 370;
_x = (screenW - _w) / 2;
- font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont);
- lineHeight = font->getFontHeight();
} else {
ws = GUI::kNormalWidgetSize;
buttonHeight = kButtonHeight;
buttonWidth = kButtonWidth;
_x = 5;
_w = screenW - 2 * 5;
- font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
- lineHeight = font->getFontHeight();
}
+ int lineHeight = g_gui.getFontHeight();
+
_h = 5 + (2 + HELP_NUM_LINES) * lineHeight + buttonHeight + 7;
_y = (screenH - _h) / 2;
@@ -781,19 +777,16 @@
void InfoDialog::setInfoText(const String& message) {
const int screenW = g_system->getOverlayWidth();
const int screenH = g_system->getOverlayHeight();
- const Graphics::Font *font;
GUI::WidgetSize ws;
if (screenW >= 400 && screenH >= 300) {
ws = GUI::kBigWidgetSize;
- font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont);
} else {
ws = GUI::kNormalWidgetSize;
- font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
}
- int width = font->getStringWidth(message) + 16;
- int height = font->getFontHeight() + 8;
+ int width = g_gui.getStringWidth(message) + 16;
+ int height = g_gui.getFontHeight() + 8;
_w = width;
_h = height;
@@ -841,15 +834,13 @@
const int screenH = g_system->getOverlayHeight();
if (screenW >= 400 && screenH >= 300) {
- _font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont);
_percentBarWidth = kBigPercentBarWidth;
} else {
- _font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
_percentBarWidth = kPercentBarWidth;
}
- int width = _font->getStringWidth(label) + 16 + _percentBarWidth;
- int height = _font->getFontHeight() + 4 * 2;
+ int width = g_gui.getStringWidth(label) + 16 + _percentBarWidth;
+ int height = g_gui.getFontHeight() + 4 * 2;
_x = (screenW - width) / 2;
_y = (screenH - height) / 2;
@@ -864,7 +855,7 @@
const int labelWidth = _w - 8 - _percentBarWidth;
// Draw the label
- g_gui.drawString(_font, _label, _x + 4, _y + 4, labelWidth, g_gui._textcolor);
+ g_gui.drawString(_label, _x + 4, _y + 4, labelWidth, g_gui._textcolor);
// Draw the percentage bar
g_gui.fillRect(_x + 4 + labelWidth, _y + 4, _percentBarWidth * (_value - _min) / (_max - _min), _h - 8, g_gui._textcolorhi);
Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- dialogs.h 2 Jun 2005 12:29:01 -0000 1.54
+++ dialogs.h 3 Jun 2005 12:51:37 -0000 1.55
@@ -199,7 +199,6 @@
kDisplayDelay = 1500
};
Common::String _label;
- const Graphics::Font *_font;
const int _min, _max;
const uint16 _incKey, _decKey;
int _percentBarWidth;
- Previous 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
- Next message: [Scummvm-cvs-logs] CVS: scummvm/gui newgui.cpp,1.115,1.116 newgui.h,1.60,1.61
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list