jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Partially unrevert 05e82c24 for macOS which still needs it"

Browse source 
This reverts commit 080421f2fb.
This commit is contained in:
Cameron Gutman 2020-05-06 21:41:57 -07:00
commit 51c4ecc879
4 changed files with 1 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/streaming/input/input.cpp
View file

@ -19,7 +19,6 @@ SdlInputHandler::SdlInputHandler(StreamingPreferences& prefs, NvComputer*, int s
m_StreamHeight(streamHeight),
m_AbsoluteMouseMode(prefs.absoluteMouseMode),
m_AbsoluteTouchMode(prefs.absoluteTouchMode),
m_PendingFocusGain(false),
m_LeftButtonReleaseTimer(0),
m_RightButtonReleaseTimer(0),
m_DragTimer(0),
@ -193,30 +192,6 @@ void SdlInputHandler::raiseAllKeys()
m_KeysDown.clear();
}
void SdlInputHandler::notifyFocusGained()
{
#if defined(Q_OS_DARWIN)
int mouseX, mouseY;
Uint32 mouseState = SDL_GetGlobalMouseState(&mouseX, &mouseY);
if (mouseState & SDL_BUTTON_LMASK) {
int x, y, width, height;
SDL_GetWindowPosition(m_Window, &x, &y);
SDL_GetWindowSize(m_Window, &width, &height);
if (mouseX > x && mouseX < x+width && mouseY > y && mouseY < y+height) {
if (m_AbsoluteMouseMode) {
// Send synthetic mouse motion until the button is lifted
m_PendingFocusGain = true;
}
else {
// Recapture the mouse
// FIXME: Why is this necessary with SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH?
setCaptureActive(true);
}
}
}
#endif
}
void SdlInputHandler::notifyFocusLost()
{
// Release mouse cursor when another window is activated (e.g. by using ALT+TAB).