diff options
author | Morph <39850852+Morph1984@users.noreply.github.com> | 2021-07-28 04:46:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-28 04:46:27 +0200 |
commit | 5593a3716e918c36e9e9f4b0709f2f85e083b6bd (patch) | |
tree | bfcb19aed0cfd114210fdc85f197d8f6828065a1 | |
parent | Merge pull request #6753 from jbeich/libusb (diff) | |
parent | qt_web_browser: Fix lambda capture for HIDButton (diff) | |
download | yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar.gz yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar.bz2 yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar.lz yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar.xz yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.tar.zst yuzu-5593a3716e918c36e9e9f4b0709f2f85e083b6bd.zip |
-rw-r--r-- | src/yuzu/applets/qt_web_browser.cpp | 15 | ||||
-rw-r--r-- | src/yuzu/applets/qt_web_browser.h | 3 | ||||
-rw-r--r-- | src/yuzu/applets/qt_web_browser_scripts.h | 6 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/yuzu/applets/qt_web_browser.cpp b/src/yuzu/applets/qt_web_browser.cpp index b112dd7b0..652d99570 100644 --- a/src/yuzu/applets/qt_web_browser.cpp +++ b/src/yuzu/applets/qt_web_browser.cpp @@ -107,6 +107,7 @@ void QtNXWebEngineView::LoadLocalWebPage(const std::string& main_url, is_local = true; LoadExtractedFonts(); + FocusFirstLinkElement(); SetUserAgent(UserAgent::WebApplet); SetFinished(false); SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed); @@ -121,6 +122,7 @@ void QtNXWebEngineView::LoadExternalWebPage(const std::string& main_url, const std::string& additional_args) { is_local = false; + FocusFirstLinkElement(); SetUserAgent(UserAgent::WebApplet); SetFinished(false); SetExitReason(Service::AM::Applets::WebExitReason::EndButtonPressed); @@ -208,7 +210,7 @@ void QtNXWebEngineView::HandleWindowFooterButtonPressedOnce() { if (input_interpreter->IsButtonPressedOnce(button)) { page()->runJavaScript( QStringLiteral("yuzu_key_callbacks[%1] == null;").arg(static_cast<u8>(button)), - [&](const QVariant& variant) { + [this, button](const QVariant& variant) { if (variant.toBool()) { switch (button) { case HIDButton::A: @@ -364,6 +366,17 @@ void QtNXWebEngineView::LoadExtractedFonts() { Qt::QueuedConnection); } +void QtNXWebEngineView::FocusFirstLinkElement() { + QWebEngineScript focus_link_element; + + focus_link_element.setName(QStringLiteral("focus_link_element.js")); + focus_link_element.setSourceCode(QString::fromStdString(FOCUS_LINK_ELEMENT_SCRIPT)); + focus_link_element.setWorldId(QWebEngineScript::MainWorld); + focus_link_element.setInjectionPoint(QWebEngineScript::Deferred); + focus_link_element.setRunsOnSubFrames(true); + default_profile->scripts()->insert(focus_link_element); +} + #endif QtWebBrowser::QtWebBrowser(GMainWindow& main_window) { diff --git a/src/yuzu/applets/qt_web_browser.h b/src/yuzu/applets/qt_web_browser.h index 7ad07409f..7e9f703fc 100644 --- a/src/yuzu/applets/qt_web_browser.h +++ b/src/yuzu/applets/qt_web_browser.h @@ -161,6 +161,9 @@ private: /// Loads the extracted fonts using JavaScript. void LoadExtractedFonts(); + /// Brings focus to the first available link element. + void FocusFirstLinkElement(); + InputCommon::InputSubsystem* input_subsystem; std::unique_ptr<UrlRequestInterceptor> url_interceptor; diff --git a/src/yuzu/applets/qt_web_browser_scripts.h b/src/yuzu/applets/qt_web_browser_scripts.h index 992837a85..c4ba8d40f 100644 --- a/src/yuzu/applets/qt_web_browser_scripts.h +++ b/src/yuzu/applets/qt_web_browser_scripts.h @@ -73,6 +73,12 @@ constexpr char LOAD_NX_FONT[] = R"( })(); )"; +constexpr char FOCUS_LINK_ELEMENT_SCRIPT[] = R"( +if (document.getElementsByTagName("a").length > 0) { + document.getElementsByTagName("a")[0].focus(); +} +)"; + constexpr char GAMEPAD_SCRIPT[] = R"( window.addEventListener("gamepadconnected", function(e) { console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.", |