thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Implement scroll wheel support for scrolling inventory

Browse source
This commit is contained in:
Paul Gilbert 2015-02-21 17:45:20 -05:00
parent c660119c22
commit 076ce7e6c1
4 changed files with 73 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

90
engines/mads/user_interface.cpp
View file

@ -495,7 +495,6 @@ void UserInterface::drawScroller() {
void UserInterface::updateInventoryScroller() {
ScreenObjects &screenObjects = _vm->_game->_screenObjects;
Common::Array<int> &inventoryList = _vm->_game->_objects._inventoryList;
if (screenObjects._inputMode != kInputBuildingSentences)
return;
@ -518,45 +517,8 @@ void UserInterface::updateInventoryScroller() {
_scrollbarQuickly = _vm->_events->_vD2 < 1;
_scrollbarMilliTime = currentMilli;
switch (_scrollbarStrokeType) {
case SCROLLBAR_UP:
// Scroll up
if (_inventoryTopIndex > 0 && inventoryList.size() > 0) {
--_inventoryTopIndex;
_inventoryChanged = true;
}
break;
case SCROLLBAR_DOWN:
// Scroll down
if (_inventoryTopIndex < ((int)inventoryList.size() - 1) && inventoryList.size() > 1) {
++_inventoryTopIndex;
_inventoryChanged = true;
}
break;
case SCROLLBAR_ELEVATOR: {
// Inventory slider
int newIndex = CLIP((int)_vm->_events->currentPos().y - 170, 0, 17)
* inventoryList.size() / 10;
if (newIndex >= (int)inventoryList.size())
newIndex = inventoryList.size() - 1;
if (inventoryList.size() > 0) {
_inventoryChanged = newIndex != _inventoryTopIndex;
_inventoryTopIndex = newIndex;
}
break;
}
default:
break;
}
if (_inventoryChanged) {
int dummy;
updateSelection(CAT_INV_LIST, 0, &dummy);
}
// Change the scrollbar and visible inventory list
changeScrollBar();
}
}
}
@ -569,6 +531,54 @@ void UserInterface::updateInventoryScroller() {
_scrollbarOldElevator = _scrollbarElevator;
}
void UserInterface::changeScrollBar() {
Common::Array<int> &inventoryList = _vm->_game->_objects._inventoryList;
ScreenObjects &screenObjects = _vm->_game->_screenObjects;
if (screenObjects._inputMode != kInputBuildingSentences)
return;
switch (_scrollbarStrokeType) {
case SCROLLBAR_UP:
// Scroll up
if (_inventoryTopIndex > 0 && inventoryList.size() > 0) {
--_inventoryTopIndex;
_inventoryChanged = true;
}
break;
case SCROLLBAR_DOWN:
// Scroll down
if (_inventoryTopIndex < ((int)inventoryList.size() - 1) && inventoryList.size() > 1) {
++_inventoryTopIndex;
_inventoryChanged = true;
}
break;
case SCROLLBAR_ELEVATOR: {
// Inventory slider
int newIndex = CLIP((int)_vm->_events->currentPos().y - 170, 0, 17)
* inventoryList.size() / 10;
if (newIndex >= (int)inventoryList.size())
newIndex = inventoryList.size() - 1;
if (inventoryList.size() > 0) {
_inventoryChanged = newIndex != _inventoryTopIndex;
_inventoryTopIndex = newIndex;
}
break;
}
default:
break;
}
if (_inventoryChanged) {
int dummy;
updateSelection(CAT_INV_LIST, 0, &dummy);
}
}
void UserInterface::scrollbarChanged() {
Common::Rect r(73, 4, 73 + 9, 4 + 38);
_uiSlots.add(r);