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

Merge pull request #8043 from jordan-woyak/mapping-ui-event-block-fix 

DolphinQt: Fix mapping of space, return, and mouse-clicks.
This commit is contained in:
Connor McLaughlin 2019-04-28 23:49:23 +10:00 committed by GitHub
parent 1b1662773e 4e39d833ae
commit aee1551a55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt/Config/Mapping/MappingButton.cpp
View File

@ -56,7 +56,7 @@ MappingButton::MappingButton(MappingWidget* parent, ControlReference* ref, bool
setToolTip(
tr("Left-click to detect input.\nMiddle-click to clear.\nRight-click for more options."));
connect(this, &MappingButton::pressed, this, &MappingButton::Detect);
connect(this, &MappingButton::clicked, this, &MappingButton::Detect);
if (indicator)
connect(parent, &MappingWidget::Update, this, &MappingButton::UpdateIndicator);

20
Source/Core/DolphinQt/Config/Mapping/MappingCommon.cpp
View File

@ -10,6 +10,7 @@
#include <QPushButton>
#include <QRegExp>
#include <QString>
#include <QTimer>
#include "DolphinQt/QtUtils/BlockUserInputFilter.h"
#include "InputCommon/ControlReference/ControlReference.h"
@ -52,7 +53,9 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
const std::vector<std::string>& device_strings,
const ciface::Core::DeviceQualifier& default_device, Quote quote)
{
button->installEventFilter(BlockUserInputFilter::Instance());
const auto filter = new BlockUserInputFilter(button);
button->installEventFilter(filter);
button->grabKeyboard();
button->grabMouse();
@ -63,16 +66,23 @@ QString DetectExpression(QPushButton* button, ciface::Core::DeviceContainer& dev
QApplication::processEvents();
// Avoid that the button press itself is registered as an event
Common::SleepCurrentThread(100);
Common::SleepCurrentThread(50);
std::shared_ptr<ciface::Core::Device> device;
ciface::Core::Device::Input* input;
std::tie(device, input) = device_container.DetectInput(INPUT_DETECT_TIME, device_strings);
button->releaseMouse();
button->releaseKeyboard();
button->removeEventFilter(BlockUserInputFilter::Instance());
const auto timer = new QTimer(button);
button->connect(timer, &QTimer::timeout, [button, filter] {
button->releaseMouse();
button->releaseKeyboard();
button->removeEventFilter(filter);
});
// Prevent mappings of "space", "return", or mouse clicks from re-activating detection.
timer->start(500);
button->setText(old_text);

6
Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.cpp
View File

@ -6,12 +6,6 @@
#include <QEvent>
BlockUserInputFilter* BlockUserInputFilter::Instance()
{
static BlockUserInputFilter s_block_user_input_filter;
return &s_block_user_input_filter;
}
bool BlockUserInputFilter::eventFilter(QObject* object, QEvent* event)
{
const QEvent::Type event_type = event->type();

3
Source/Core/DolphinQt/QtUtils/BlockUserInputFilter.h
View File

@ -12,9 +12,8 @@ class BlockUserInputFilter : public QObject
{
Q_OBJECT
public:
static BlockUserInputFilter* Instance();
using QObject::QObject;
private:
BlockUserInputFilter() = default;
bool eventFilter(QObject* object, QEvent* event) override;
};