summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-03 00:00:28 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-03 00:00:28 +0300
commite9301ddce5a6ddf77dafc1f56f0b1461b2092c6f (patch)
treec9a1ed0ef0d9b15a1b3d617f9a17999bed768ff7 /src/gui/gui.cpp
parent0b228c1ed05177a761dce44df31f087c0313dc64 (diff)
downloadmanaverse-e9301ddce5a6ddf77dafc1f56f0b1461b2092c6f.tar.gz
manaverse-e9301ddce5a6ddf77dafc1f56f0b1461b2092c6f.tar.bz2
manaverse-e9301ddce5a6ddf77dafc1f56f0b1461b2092c6f.tar.xz
manaverse-e9301ddce5a6ddf77dafc1f56f0b1461b2092c6f.zip
Add support for relative mouse move in android version.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 8d26acea8..268f05fc1 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -36,6 +36,7 @@
#include "keydata.h"
#include "keyevent.h"
#include "keyinput.h"
+#include "mouseinput.h"
#include "touchmanager.h"
#include "resources/image.h"
@@ -272,7 +273,7 @@ void Gui::logic()
handleModalFocus();
handleModalMouseInputFocus();
- if (mInput)
+ if (guiInput)
handleMouseInput();
mTop->logic();
@@ -658,7 +659,7 @@ void Gui::handleMouseInput()
BLOCK_START("Gui::handleMouseInput")
while (!mInput->isMouseQueueEmpty())
{
- const gcn::MouseInput mouseInput = mInput->dequeueMouseInput();
+ const MouseInput mouseInput = guiInput->dequeueMouseInput2();
if (touchManager.processEvent(mouseInput))
{