diff --git a/apps/openmw/mwinput/mousemanager.cpp b/apps/openmw/mwinput/mousemanager.cpp index 91ccd4e0a7..ffbe40a2db 100644 --- a/apps/openmw/mwinput/mousemanager.cpp +++ b/apps/openmw/mwinput/mousemanager.cpp @@ -119,9 +119,10 @@ namespace MWInput mBindingsManager->setPlayerControlsEnabled(!guiMode); mBindingsManager->mouseReleased(arg, id); - MWBase::Environment::get().getLuaManager()->inputEvent( - { MWBase::LuaManager::InputEvent::MouseButtonReleased, arg.button }); } + + MWBase::Environment::get().getLuaManager()->inputEvent( + { MWBase::LuaManager::InputEvent::MouseButtonReleased, arg.button }); } void MouseManager::mouseWheelMoved(const SDL_MouseWheelEvent& arg) @@ -130,11 +131,11 @@ namespace MWInput if (mBindingsManager->isDetectingBindingState() || !input->controlsDisabled()) { mBindingsManager->mouseWheelMoved(arg); - MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::MouseWheel, - MWBase::LuaManager::InputEvent::WheelChange{ arg.x, arg.y } }); } input->setJoystickLastUsed(false); + MWBase::Environment::get().getLuaManager()->inputEvent({ MWBase::LuaManager::InputEvent::MouseWheel, + MWBase::LuaManager::InputEvent::WheelChange{ arg.x, arg.y } }); } void MouseManager::mousePressed(const SDL_MouseButtonEvent& arg, Uint8 id) @@ -170,9 +171,9 @@ namespace MWInput if ((!settingsWindow || !settingsWindow->isVisible()) && !input->controlsDisabled()) { mBindingsManager->mousePressed(arg, id); - MWBase::Environment::get().getLuaManager()->inputEvent( - { MWBase::LuaManager::InputEvent::MouseButtonPressed, arg.button }); } + MWBase::Environment::get().getLuaManager()->inputEvent( + { MWBase::LuaManager::InputEvent::MouseButtonPressed, arg.button }); } void MouseManager::updateCursorMode() diff --git a/files/data/scripts/omw/input/settings.lua b/files/data/scripts/omw/input/settings.lua index 3c1ba4d6b9..5243a86844 100644 --- a/files/data/scripts/omw/input/settings.lua +++ b/files/data/scripts/omw/input/settings.lua @@ -181,7 +181,6 @@ return { onKeyPress = function(key) bindButton(key.code ~= input.KEY.Escape and 'keyboard' or nil, key.code) end, - -- TODO: currently never triggers, because mouse events are disabled while inside settings onMouseButtonPress = function(button) bindButton('mouse', button) end,