From 226202ff807dc860991af0d6665ef9e9b48c1bed Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 28 Jan 2014 16:14:15 +0300 Subject: Move direct SDL_GetMouseState calls into method in gui class. --- src/gui/gui.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/gui/gui.cpp') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index a8c31469a..d016c0aa3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -494,7 +494,7 @@ void Gui::draw() touchManager.draw(); int mouseX, mouseY; - const uint8_t button = SDL_GetMouseState(&mouseX, &mouseY); + const uint8_t button = getMouseState(&mouseX, &mouseY); if ((client->getMouseFocused() || button & SDL_BUTTON(1)) && mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F) @@ -787,7 +787,7 @@ MouseEvent *Gui::createMouseEvent(Window *const widget) int mouseY = 0; getAbsolutePosition(widget, x, y); - SDL_GetMouseState(&mouseX, &mouseY); + getMouseState(&mouseX, &mouseY); return new MouseEvent(widget, mShiftPressed, mControlPressed, mAltPressed, mMetaPressed, 0, 0, @@ -939,3 +939,8 @@ void Gui::removeDragged(gcn::Widget *widget) if (mFocusHandler->getDraggedWidget() == widget) mFocusHandler->setDraggedWidget(nullptr); } + +uint32_t Gui::getMouseState(int *const x, int *const y) const +{ + return SDL_GetMouseState(x, y); +} -- cgit v1.2.3-70-g09d2