From 28be95b4014db9c9f77886bdb04b4a9115b6a811 Mon Sep 17 00:00:00 2001 From: "Xawotihs@gmail.com" Date: Sun, 29 Jan 2012 22:34:55 +0000 Subject: [PATCH] Updated Qt frontend to latest Scroll interface --- JGE/include/qt/corewrapper.h | 2 +- JGE/src/qt/corewrapper.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/JGE/include/qt/corewrapper.h b/JGE/include/qt/corewrapper.h index 317da8f40..0599d0a22 100644 --- a/JGE/include/qt/corewrapper.h +++ b/JGE/include/qt/corewrapper.h @@ -73,7 +73,7 @@ public: return g_startTimer.elapsed(); }; Q_INVOKABLE void doScroll(int x, int y, int magnitude) { - m_engine->Scroll(x, y, magnitude); + m_engine->Scroll(x, y); }; int getNominalHeight(){ return SCREEN_HEIGHT;}; int getNominalWidth(){ return SCREEN_WIDTH;}; diff --git a/JGE/src/qt/corewrapper.cpp b/JGE/src/qt/corewrapper.cpp index f7e66cc94..d6c6503b1 100644 --- a/JGE/src/qt/corewrapper.cpp +++ b/JGE/src/qt/corewrapper.cpp @@ -333,10 +333,10 @@ void WagicCore::wheelEvent ( QGraphicsSceneWheelEvent * event) #endif { if(event->orientation() == Qt::Vertical) - m_engine->Scroll(0, 3*event->delta(), static_cast(sqrt(9*event->delta()*event->delta()))); + m_engine->Scroll(0, 3*event->delta()); else - m_engine->Scroll(3*event->delta(), 0, static_cast(sqrt(9*event->delta()*event->delta()))); + m_engine->Scroll(3*event->delta(), 0); event->accept(); }