ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MappingButton: make m_block a Common::Flag

This commit is contained in:
Michael Maltese 2017-06-13 17:36:30 -07:00
parent 5b6c8c3ad0
commit 7c79673d78
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,19 +33,21 @@ void MappingButton::Connect()
void MappingButton::OnButtonPressed() void MappingButton::OnButtonPressed()
{ {
if (m_block || m_parent->GetDevice() == nullptr || !m_reference->IsInput()) if (m_parent->GetDevice() == nullptr || !m_reference->IsInput())
return; return;
if (!m_block.TestAndSet())
return;
grabKeyboard();
grabMouse();
// Make sure that we don't block event handling // Make sure that we don't block event handling
std::thread([this] { std::thread([this] {
const auto dev = m_parent->GetDevice(); const auto dev = m_parent->GetDevice();
setText(QStringLiteral("...")); setText(QStringLiteral("..."));
m_block = true;
grabKeyboard();
grabMouse();
// Avoid that the button press itself is registered as an event // Avoid that the button press itself is registered as an event
Common::SleepCurrentThread(100); Common::SleepCurrentThread(100);
@ -55,7 +57,7 @@ void MappingButton::OnButtonPressed()
releaseMouse(); releaseMouse();
releaseKeyboard(); releaseKeyboard();
m_block = false; m_block.Clear();
if (!expr.isEmpty()) if (!expr.isEmpty())
{ {
@ -94,7 +96,7 @@ bool MappingButton::event(QEvent* event)
const QEvent::Type event_type = event->type(); const QEvent::Type event_type = event->type();
// Returning 'true' means "yes, this event has been handled, don't propagate it to parent // Returning 'true' means "yes, this event has been handled, don't propagate it to parent
// widgets". // widgets".
if (m_block && if (m_block.IsSet() &&
(event_type == QEvent::KeyPress || event_type == QEvent::KeyRelease || (event_type == QEvent::KeyPress || event_type == QEvent::KeyRelease ||
event_type == QEvent::MouseButtonPress || event_type == QEvent::MouseButtonRelease || event_type == QEvent::MouseButtonPress || event_type == QEvent::MouseButtonRelease ||
event_type == QEvent::MouseButtonDblClick)) event_type == QEvent::MouseButtonDblClick))

3
Source/Core/DolphinQt2/Config/Mapping/MappingButton.h
View File

@ -4,6 +4,7 @@
#pragma once #pragma once
#include "Common/Flag.h"
#include "DolphinQt2/QtUtils/ElidedButton.h" #include "DolphinQt2/QtUtils/ElidedButton.h"
class ControlReference; class ControlReference;
@ -33,5 +34,5 @@ private:
MappingWidget* m_parent; MappingWidget* m_parent;
ControlReference* m_reference; ControlReference* m_reference;
bool m_block = false; Common::Flag m_block;
}; };