Fix input focus issues #633
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
This reverts commit ff918df. This changed it from "RendererHasFocus" to "UIHasFocus", which is wrong. Specifically, it broke for non-Render to Main Window cases where the renderer window isn't managed by wx. It also broke the pending exclusive fullscreen support, which checks this function to determine if the renderer is on top so it can full-screen it. We'll add a new hook, "UIHasFocus", in the next commit.
We can't use RendererHasFocus for this purpose because of some issues with exclusive fullscreen, and the new RendererHasFocus implementation didn't work for non-Render to Main Window cases, since the renderer window wasn't managed by wx.
| @@ -84,7 +84,7 @@ bool Device::Control::InputGateOn() | |||
| { | |||
| if (SConfig::GetInstance().m_BackgroundInput) | |||
| return true; | |||
| else if (Host_RendererHasFocus()) | |||
| else if (Host_RendererHasFocus() || Host_UIHasFocus()) | |||
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
|
Thanks for restoring the old |
| wxWindow *window = wxWindow::FindFocus(); | ||
| if (window == nullptr) | ||
| return false; | ||
| // Why these different cases? |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
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.
This simply fixes the Render to Main Window / Background Input issue. I haven't looked at TAS input, the input OSD, nor radius=100 bugs yet.