[Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.47,1.48 interface.cpp,1.106,1.107 interface.h,1.59,1.60
Eugene Sandulenko
sev at users.sourceforge.net
Sun Jun 19 16:42:32 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12654
Modified Files:
input.cpp interface.cpp interface.h
Log Message:
Support for mouse wheel in Options dialog and in Converse panel
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- input.cpp 19 Jun 2005 14:06:19 -0000 1.47
+++ input.cpp 19 Jun 2005 23:41:39 -0000 1.48
@@ -130,6 +130,12 @@
_mousePos = event.mouse;
_interface->update(_mousePos, UPDATE_RIGHTBUTTONCLICK);
break;
+ case OSystem::EVENT_WHEELUP:
+ _interface->update(_mousePos, UPDATE_WHEELUP);
+ break;
+ case OSystem::EVENT_WHEELDOWN:
+ _interface->update(_mousePos, UPDATE_WHEELDOWN);
+ break;
case OSystem::EVENT_MOUSEMOVE:
_mousePos = event.mouse;
break;
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- interface.cpp 19 Jun 2005 14:06:19 -0000 1.106
+++ interface.cpp 19 Jun 2005 23:41:40 -0000 1.107
@@ -1213,6 +1213,12 @@
if (updateFlag & UPDATE_MOUSECLICK) {
handleConverseClick(mousePoint);
}
+ if (updateFlag & UPDATE_WHEELUP) {
+ converseChangePos(-1);
+ }
+ if (updateFlag & UPDATE_WHEELDOWN) {
+ converseChangePos(1);
+ }
if (_vm->_puzzle->isActive()) {
_vm->_puzzle->handleClick(mousePoint);
@@ -1229,6 +1235,16 @@
if (updateFlag & UPDATE_MOUSECLICK) {
handleOptionClick(mousePoint);
}
+ if (updateFlag & UPDATE_WHEELUP) {
+ if (_optionSaveFileTop)
+ _optionSaveFileTop--;
+ calcOptionSaveSlider();
+ }
+ if (updateFlag & UPDATE_WHEELDOWN) {
+ if (_optionSaveFileTop < _vm->getSaveFilesCount() - _vm->getDisplayInfo().optionSaveFileVisible)
+ _optionSaveFileTop++;
+ calcOptionSaveSlider();
+ }
}
}
Index: interface.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- interface.h 19 Jun 2005 14:06:19 -0000 1.59
+++ interface.h 19 Jun 2005 23:41:40 -0000 1.60
@@ -38,7 +38,9 @@
UPDATE_MOUSEMOVE = 1,
UPDATE_LEFTBUTTONCLICK = 2,
UPDATE_RIGHTBUTTONCLICK = 4,
- UPDATE_MOUSECLICK = UPDATE_LEFTBUTTONCLICK | UPDATE_RIGHTBUTTONCLICK
+ UPDATE_MOUSECLICK = UPDATE_LEFTBUTTONCLICK | UPDATE_RIGHTBUTTONCLICK,
+ UPDATE_WHEELUP = 8,
+ UPDATE_WHEELDOWN = 16
};
#define ITE_INVENTORY_SIZE 24
More information about the Scummvm-git-logs
mailing list