history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-19 13:05:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Fix relative mode for PSMouse

Browse Source
This commit is contained in:
Connor McLaughlin
2022-08-10 16:32:55 +10:00
parent ddbe28830e
commit 795ddee79c
7 changed files with 45 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/duckstation-qt/displaywidget.cpp
View File

@ -101,17 +101,15 @@ std::optional<WindowInfo> DisplayWidget::getWindowInfo()
return wi;
}
void DisplayWidget::updateRelativeMode(bool master_enable)
void DisplayWidget::updateRelativeMode(bool enabled)
{
bool relative_mode = master_enable/* && InputManager::HasPointerAxisBinds()*/;
#ifdef _WIN32
// prefer ClipCursor() over warping movement when we're using raw input
bool clip_cursor = relative_mode && InputManager::IsUsingRawInput();
if (m_relative_mouse_enabled == relative_mode && m_clip_mouse_enabled == clip_cursor)
bool clip_cursor = enabled && InputManager::IsUsingRawInput();
if (m_relative_mouse_enabled == enabled && m_clip_mouse_enabled == clip_cursor)
return;
Log_InfoPrintf("updateRelativeMode(): relative=%s, clip=%s", relative_mode ? "yes" : "no",
Log_InfoPrintf("updateRelativeMode(): relative=%s, clip=%s", enabled ? "yes" : "no",
clip_cursor ? "yes" : "no");
if (!clip_cursor && m_clip_mouse_enabled)
@ -120,13 +118,13 @@ void DisplayWidget::updateRelativeMode(bool master_enable)
ClipCursor(nullptr);
}
#else
if (m_relative_mouse_enabled == relative_mode)
if (m_relative_mouse_enabled == enabled)
return;
Log_InfoPrintf("updateRelativeMode(): relative=%s", relative_mode ? "yes" : "no");
Log_InfoPrintf("updateRelativeMode(): relative=%s", enabled ? "yes" : "no");
#endif
if (relative_mode)
if (enabled)
{
#ifdef _WIN32
m_relative_mouse_enabled = !clip_cursor;
@ -146,26 +144,21 @@ void DisplayWidget::updateRelativeMode(bool master_enable)
}
}
void DisplayWidget::updateCursor(bool master_enable)
void DisplayWidget::updateCursor(bool hidden)
{
#ifdef _WIN32
const bool hide = master_enable && (m_should_hide_cursor || m_relative_mouse_enabled || m_clip_mouse_enabled);
#else
const bool hide = master_enable && (m_should_hide_cursor || m_relative_mouse_enabled);
#endif
if (m_cursor_hidden == hide)
if (m_cursor_hidden == hidden)
return;
m_cursor_hidden = hide;
if (hide)
m_cursor_hidden = hidden;
if (hidden)
{
Log_DevPrintf("updateCursor(): Cursor is now hidden");
setCursor(Qt::BlankCursor);
Log_WarningPrint("set blank cursor");
}
else
{
Log_DevPrintf("updateCursor(): Cursor is now shown");
unsetCursor();
Log_WarningPrint("clear blank cursor");
}
}