mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 17:15:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_mouse_events' into 'master'

Browse source 
Make the documentation clearer, match the documentation when no buttons are pressed for an event

See merge request OpenMW/openmw!1842
This commit is contained in:
psi29a 2022-05-10 19:33:32 +00:00
commit 2e8f9f471f
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/lua_ui/widget.cpp
View file

@ -156,9 +156,11 @@ namespace LuaUi
MyGUI::IntPoint absolutePosition = mWidget->getAbsolutePosition();
osg::Vec2f offset = position - osg::Vec2f(absolutePosition.left, absolutePosition.top);
sol::table table = makeTable();
int sdlButton = SDLUtil::myGuiMouseButtonToSdl(button);
table["position"] = position;
table["offset"] = offset;
table["button"] = SDLUtil::myGuiMouseButtonToSdl(button);
if (sdlButton == 0) // nil if no button was pressed
table["button"] = sdlButton;
return table;
}

3
files/lua_api/openmw/ui.lua
View file

@ -217,7 +217,8 @@
-- @type MouseEvent
-- @field openmw.util#Vector2 position Absolute position of the mouse cursor
-- @field openmw.util#Vector2 offset Position of the mouse cursor relative to the widget
-- @field #number button Mouse button which triggered the event (could be nil)
-- @field #number button Mouse button which triggered the event.
-- Matches the arguments of @{openmw_input#input.isMouseButtonPressed} (`nil` for none, 1 for left, 3 for right).
---
-- Register a new texture resource. Can be used to manually atlas UI textures.