From 9bb11133522836a9c5e251550ac88c9a4e091c0e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 30 May 2014 12:46:49 +0300 Subject: Move main window related code into windowmanager. --- src/gui/gui.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui/gui.cpp') diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index c7d7fd8a1..52abd30b6 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -70,6 +70,7 @@ #include "gui/sdlinput.h" #include "gui/theme.h" #include "gui/viewport.h" +#include "gui/windowmanager.h" #include "gui/fonts/font.h" @@ -78,6 +79,7 @@ #include "client.h" #include "configuration.h" #include "dragdrop.h" +#include "settings.h" #include "touchmanager.h" #include "events/keyevent.h" @@ -463,7 +465,7 @@ void Gui::draw() int mouseY; const MouseStateType button = getMouseState(&mouseX, &mouseY); - if ((client->getMouseFocused() || button & SDL_BUTTON(1)) + if ((settings.mouseFocused || button & SDL_BUTTON(1)) && mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F) { const Image *const image = dragDrop.getItemImage(); -- cgit v1.2.3-70-g09d2