The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

MappingButton: grab and release mouse and keyboard instead of calling parent SetBlockInputs

Browse Source
This commit is contained in:
Michael Maltese
2017-06-13 17:11:52 -07:00
parent 2188ac785a
commit 5b6c8c3ad0
6 changed files with 19 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinQt2/Config/Mapping/MappingButton.cpp
View File

@ -42,7 +42,9 @@ void MappingButton::OnButtonPressed()
setText(QStringLiteral("..."));
SetBlockInputs(true);
m_block = true;
grabKeyboard();
grabMouse();
// Avoid that the button press itself is registered as an event
Common::SleepCurrentThread(100);
@ -51,7 +53,10 @@ void MappingButton::OnButtonPressed()
m_parent->GetParent()->GetDeviceQualifier(),
m_parent->GetController()->default_device);
SetBlockInputs(false);
releaseMouse();
releaseKeyboard();
m_block = false;
if (!expr.isEmpty())
{
m_reference->expression = expr.toStdString();
@ -84,15 +89,20 @@ void MappingButton::Update()
m_parent->SaveSettings();
}
void MappingButton::SetBlockInputs(const bool block)
{
m_parent->SetBlockInputs(block);
m_block = block;
}
bool MappingButton::event(QEvent* event)
{
return !m_block ? QPushButton::event(event) : true;
const QEvent::Type event_type = event->type();
// Returning 'true' means "yes, this event has been handled, don't propagate it to parent
// widgets".
if (m_block &&
(event_type == QEvent::KeyPress || event_type == QEvent::KeyRelease ||
event_type == QEvent::MouseButtonPress || event_type == QEvent::MouseButtonRelease ||
event_type == QEvent::MouseButtonDblClick))
{
return true;
}
return QPushButton::event(event);
}
void MappingButton::mouseReleaseEvent(QMouseEvent* event)