diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-07-14 20:41:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 20:41:41 -0400 |
| commit | 2fed6dd7e18b638d5108eacb7ebd535707f95453 (patch) | |
| tree | e830cb8e73f176e1fadc8804f43f183c343b82a8 /src | |
| parent | 9627c550a0c4403813af23d6bdf5348aef0d08d7 (diff) | |
| parent | cbef6b1fca457b1a36df17c758eee94684020d6e (diff) | |
Merge pull request #8536 from Morph1984/fix-webapplet-input
qt_web_browser: Fix button inputs with QtWebEngine
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/applets/qt_web_browser.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index 790edbb2a..89bd482e0 100644 --- a/src/yuzu/applets/qt_web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -2,6 +2,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #ifdef YUZU_USE_QT_WEB_ENGINE +#include <bit> + #include <QApplication> #include <QKeyEvent> @@ -211,8 +213,10 @@ template <Core::HID::NpadButton... T> void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() { const auto f = [this](Core::HID::NpadButton button) { if (input_interpreter->IsButtonPressedOnce(button)) { + const auto button_index = std::countr_zero(static_cast<u64>(button)); + page()->runJavaScript( - QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(static_cast<u8>(button)), + QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(button_index), [this, button](const QVariant& variant) { if (variant.toBool()) { switch (button) { @@ -236,7 +240,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() { page()->runJavaScript( QStringLiteral("if (yuzu_key_callbacks[%1] != null) { yuzu_key_callbacks[%1](); }") - .arg(static_cast<u8>(button))); + .arg(button_index)); } }; |