summaryrefslogtreecommitdiff
path: root/src/PowderToy.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-21 18:51:28 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-21 18:51:28 (GMT)
commit1cee908c165ead0fcecba4519d4584f3935988b5 (patch)
treec03981effdc5543fd9e50f70aab678c9631dbbcd /src/PowderToy.cpp
parent8ec6aae617525d13697d1c2a612ac37be0f341d5 (diff)
downloadpowder-1cee908c165ead0fcecba4519d4584f3935988b5.zip
powder-1cee908c165ead0fcecba4519d4584f3935988b5.tar.gz
Fix thumbnail crash, turns out SaveButton was storing a Thumbnail pointer, not a Thumbnail as I thought
Diffstat (limited to 'src/PowderToy.cpp')
-rw-r--r--src/PowderToy.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/PowderToy.cpp b/src/PowderToy.cpp
index f8be793..a13a817 100644
--- a/src/PowderToy.cpp
+++ b/src/PowderToy.cpp
@@ -92,10 +92,22 @@ int main(int argc, char * argv[])
engine->onMouseMove(event.motion.x, event.motion.y);
break;
case SDL_MOUSEBUTTONDOWN:
- engine->onMouseClick(event.motion.x, event.motion.y, event.button.button);
+ if(event.button.button == SDL_BUTTON_WHEELUP)
+ {
+ engine->onMouseWheel(event.motion.x, event.motion.y, 1);
+ }
+ else if (event.button.button == SDL_BUTTON_WHEELDOWN)
+ {
+ engine->onMouseWheel(event.motion.x, event.motion.y, -1);
+ }
+ else
+ {
+ engine->onMouseClick(event.motion.x, event.motion.y, event.button.button);
+ }
break;
case SDL_MOUSEBUTTONUP:
- engine->onMouseUnclick(event.motion.x, event.motion.y, event.button.button);
+ if(event.button.button != SDL_BUTTON_WHEELUP && event.button.button != SDL_BUTTON_WHEELDOWN)
+ engine->onMouseUnclick(event.motion.x, event.motion.y, event.button.button);
break;
}
event.type = 0; //Clear last event