aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-03-07 15:32:32 -0500
committerGitHub <noreply@github.com>2019-03-07 15:32:32 -0500
commit95fff8fd23ccc5bdc2db2d4f07ccdeb31fd4edf6 (patch)
tree7acf0bc56ada3e429be14df66c1a5742f31f2d5d
parent3846cfa7ba514e98f9a276b9aec9e01781eb3636 (diff)
parent91b36c026a4e55e6c3af9c95e5732c73aefdfe0d (diff)
Merge pull request #2196 from DarkLordZach/web-applet-esc
web_browser: Add shortcut to Enter key to exit applet
-rw-r--r--src/yuzu/applets/web_browser.cpp2
-rw-r--r--src/yuzu/main.cpp5
2 files changed, 7 insertions, 0 deletions
diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/web_browser.cpp
index 6a9138d53e..979b9ec143 100644
--- a/src/yuzu/applets/web_browser.cpp
+++ b/src/yuzu/applets/web_browser.cpp
@@ -56,6 +56,8 @@ constexpr char NX_SHIM_INJECT_SCRIPT[] = R"(
window.nx.endApplet = function() {
applet_done = true;
};
+
+ window.onkeypress = function(e) { if (e.keyCode === 13) { applet_done = true; } };
)";
QString GetNXShimInjectionScript() {
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index c6f3ab4e41..41ba3c4c60 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -340,6 +340,11 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view
.arg(QString::fromStdString(std::to_string(key_code))));
};
+ QMessageBox::information(
+ this, tr("Exit"),
+ tr("To exit the web application, use the game provided controls to select exit, select the "
+ "'Exit Web Applet' option in the menu bar, or press the 'Enter' key."));
+
bool running_exit_check = false;
while (!finished) {
QApplication::processEvents();