diff options
| author | Max Horn | 2006-08-04 17:59:53 +0000 |
|---|---|---|
| committer | Max Horn | 2006-08-04 17:59:53 +0000 |
| commit | 0b50c4966cf1b378164a9df929820a69708c8531 (patch) | |
| tree | 6234588ea3d6bd80f1f7030551fc036381a186a5 /engines | |
| parent | 4ee581adb5f732c9d1af3d362210b9bd00ecc034 (diff) | |
| download | scummvm-rg350-0b50c4966cf1b378164a9df929820a69708c8531.tar.gz scummvm-rg350-0b50c4966cf1b378164a9df929820a69708c8531.tar.bz2 scummvm-rg350-0b50c4966cf1b378164a9df929820a69708c8531.zip | |
Activate _dimsInactive for ValueDisplayDialog, makes the text speed/volume change etc. mini-dialogs behave a little bit less weird (TODO: Disable cursor change)
svn-id: r23667
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/dialogs.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp index d96f840373..25e6ebaf97 100644 --- a/engines/scumm/dialogs.cpp +++ b/engines/scumm/dialogs.cpp @@ -846,17 +846,22 @@ void ConfirmDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) { #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() { |