Improve Mouse Capture Handling #4842
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Opening the options window with Escape while in screenshot mode would not draw the window, but would steal focus and deadlock the game's input This is resolved by simply adding a path to draw modals even if the UI is in "screenshot only" mode, as the escape menu should be irrespective of that mode.
Moved mouse capture functionality from the renderer to Input Temporarily patched ModelViewer, pending a major refactor to make it compatible with the input class.
Clean up mouse cursor code to use ImGuiMouseCursor_None Ignore Pi::DrawGUI as it doesn't make sense for cursors
Among other reasons, this makes the cursor visible when interacting with radial menus Lays more groundwork for better mouse handling
Web-eWorks
force-pushed
the
input-capture-mode
branch
from
a89d294
to
124f40f
Compare
Web-eWorks
force-pushed
the
input-capture-mode
branch
from
5fb513f
to
d7e1c89
Compare
This was referenced Mar 24, 2020
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See the commit messages for detailed information; this PR resolves a blocker for #4821 and fixes #4783.
In short, this PR removes the global, always-on mouse capturing when holding mouse buttons and replaces it with more intelligent, extensible handling via
Input::SetCapturingMouse().I've cleaned up mouse cursor handling as a follow-on to #4827, and fixed the input deadlock that was possible to enter as a result of the change to how we draw modals.