Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DolphinQt: Fix mapping of space, return, and mouse-clicks. #8043

Merged
merged 1 commit into from Apr 28, 2019

Conversation

3 participants
@jordan-woyak
Copy link
Member

commented Apr 27, 2019

When mapping "space" or "return" it immediately re-activated input detection which was annoying and confusing to users.

I've inserted a delay in the removal of the event blocking filter to mostly eliminate this.

I made BlockUserInputFilter no longer a singleton.

@stenzek

This comment has been minimized.

Copy link
Contributor

commented Apr 28, 2019

Seems a little hacky to rely on time elapsing to consume all the events, but if there's no other way of doing it, LGTM.

@@ -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);

This comment has been minimized.

Copy link
@BhaaLseN

BhaaLseN Apr 28, 2019

Member

Is this one even needed with the event filter? It felt odd even in the old code now that I look closely...

This comment has been minimized.

Copy link
@jordan-woyak

jordan-woyak Apr 28, 2019

Author Member

It does help when the button actually gets pressed with the "space" or "return" key.

@jordan-woyak

This comment has been minimized.

Copy link
Member Author

commented Apr 28, 2019

Seems a little hacky to rely on time elapsing to consume all the events, but if there's no other way of doing it, LGTM.

Yeah. I don't know if there is a reliable way to do it. The two input systems are completely separate.

@jordan-woyak jordan-woyak force-pushed the jordan-woyak:mapping-ui-event-block-fix branch from efe3c82 to 4e39d83 Apr 28, 2019

@stenzek stenzek merged commit aee1551 into dolphin-emu:master Apr 28, 2019

9 checks passed

default Very basic checks passed, handed off to Buildbot.
Details
lint Build succeeded on builder lint
Details
pr-android Build succeeded on builder pr-android
Details
pr-deb-dbg-x64 Build succeeded on builder pr-deb-dbg-x64
Details
pr-deb-x64 Build succeeded on builder pr-deb-x64
Details
pr-freebsd-x64 Build succeeded on builder pr-freebsd-x64
Details
pr-ubu-x64 Build succeeded on builder pr-ubu-x64
Details
pr-win-dbg-x64 Build succeeded on builder pr-win-dbg-x64
Details
pr-win-x64 Build succeeded on builder pr-win-x64
Details

@jordan-woyak jordan-woyak deleted the jordan-woyak:mapping-ui-event-block-fix branch Apr 28, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.