diff options
| author | Johannes Schickel | 2008-05-11 11:35:12 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-11 11:35:12 +0000 |
| commit | 35cc3a3d19f7a4c7c9f202f749a27eb1573cfad9 (patch) | |
| tree | a67a44d595e4aa4e903e30c07942e9a5f8de72c8 /engines/kyra/gui.cpp | |
| parent | 7da27cf28cb48fce13ebff907743f78dd6e75bc0 (diff) | |
| download | scummvm-rg350-35cc3a3d19f7a4c7c9f202f749a27eb1573cfad9.tar.gz scummvm-rg350-35cc3a3d19f7a4c7c9f202f749a27eb1573cfad9.tar.bz2 scummvm-rg350-35cc3a3d19f7a4c7c9f202f749a27eb1573cfad9.zip | |
Committed slightly modified patch #1961830 "KYRA: Scroll wheel support for Kyra 2 and 3".
svn-id: r32016
Diffstat (limited to 'engines/kyra/gui.cpp')
| -rw-r--r-- | engines/kyra/gui.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 1296717467..407be7a73a 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -36,7 +36,6 @@ namespace Kyra { GUI::GUI(KyraEngine *kyra) : _vm(kyra), _screen(kyra->screen()), _text(kyra->text()) { _menuButtonList = 0; - _haveScrollButtons = false; _redrawButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawButtonCallback); _redrawShadedButtonFunctor = BUTTON_FUNCTOR(GUI, this, &GUI::redrawShadedButtonCallback); @@ -148,13 +147,12 @@ void GUI::initMenu(Menu &menu) { } if (menu.scrollUpButtonX != -1) { - _haveScrollButtons = true; - Button *scrollUpButton = getScrollUpButton(); scrollUpButton->x = menu.scrollUpButtonX + menu.x; scrollUpButton->y = menu.scrollUpButtonY + menu.y; scrollUpButton->buttonCallback = getScrollUpButtonHandler(); scrollUpButton->nextButton = 0; + scrollUpButton->mouseWheel = -1; _menuButtonList = addButtonToList(_menuButtonList, scrollUpButton); updateMenuButton(scrollUpButton); @@ -164,11 +162,10 @@ void GUI::initMenu(Menu &menu) { scrollDownButton->y = menu.scrollDownButtonY + menu.y; scrollDownButton->buttonCallback = getScrollDownButtonHandler(); scrollDownButton->nextButton = 0; + scrollDownButton->mouseWheel = 1; _menuButtonList = addButtonToList(_menuButtonList, scrollDownButton); updateMenuButton(scrollDownButton); - } else { - _haveScrollButtons = false; } _screen->showMouse(); |