[Scummvm-cvs-logs] SF.net SVN: scummvm: [23667] scummvm/trunk/engines/scumm/dialogs.cpp
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Fri Aug 4 19:59:58 CEST 2006
Revision: 23667
Author: fingolfin
Date: 2006-08-04 10:59:53 -0700 (Fri, 04 Aug 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23667&view=rev
Log Message:
-----------
Activate _dimsInactive for ValueDisplayDialog, makes the text speed/volume change etc. mini-dialogs behave a little bit less weird (TODO: Disable cursor change)
Modified Paths:
--------------
scummvm/trunk/engines/scumm/dialogs.cpp
Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp 2006-08-04 17:47:57 UTC (rev 23666)
+++ scummvm/trunk/engines/scumm/dialogs.cpp 2006-08-04 17:59:53 UTC (rev 23667)
@@ -846,17 +846,22 @@
#pragma mark -
-ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal, int maxVal, int val, uint16 incKey, uint16 decKey)
- : GUI::Dialog("scummDummyDialog"), _label(label), _min(minVal), _max(maxVal), _value(val), _incKey(incKey), _decKey(decKey) {
+ValueDisplayDialog::ValueDisplayDialog(const Common::String& label, int minVal, int maxVal,
+ int val, uint16 incKey, uint16 decKey)
+ : GUI::Dialog("scummDummyDialog", false),
+ _label(label), _min(minVal), _max(maxVal),
+ _value(val), _incKey(incKey), _decKey(decKey) {
assert(_min <= _value && _value <= _max);
-
}
void ValueDisplayDialog::drawDialog() {
const int labelWidth = _w - 8 - _percentBarWidth;
- g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h), GUI::THEME_HINT_SAVE_BACKGROUND | GUI::THEME_HINT_FIRST_DRAW);
- g_gui.theme()->drawText(Common::Rect(_x+4, _y+4, _x+labelWidth+4, _y+g_gui.theme()->getFontHeight()+4), _label);
- g_gui.theme()->drawSlider(Common::Rect(_x+4+labelWidth, _y+4, _x+_w-4, _y+_h-4), _percentBarWidth * (_value - _min) / (_max - _min));
+ g_gui.theme()->drawDialogBackground(Common::Rect(_x, _y, _x+_w, _y+_h),
+ GUI::THEME_HINT_SAVE_BACKGROUND | GUI::THEME_HINT_FIRST_DRAW);
+ g_gui.theme()->drawText(Common::Rect(_x+4, _y+4, _x+labelWidth+4,
+ _y+g_gui.theme()->getFontHeight()+4), _label);
+ g_gui.theme()->drawSlider(Common::Rect(_x+4+labelWidth, _y+4, _x+_w-4, _y+_h-4),
+ _percentBarWidth * (_value - _min) / (_max - _min));
}
void ValueDisplayDialog::handleTickle() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list