diff options
author | Zach Hilman <zachhilman@gmail.com> | 2019-03-05 00:24:16 +0100 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2019-03-05 00:26:28 +0100 |
commit | 4130b07f88a2c23118503dbdad28fa8ef1fb8ccb (patch) | |
tree | fbaead4c77255ae13879820bd79cc12a62e056d9 | |
parent | Merge pull request #2165 from ReinUsesLisp/unbind-tex (diff) | |
download | yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar.gz yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar.bz2 yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar.lz yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar.xz yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.tar.zst yuzu-4130b07f88a2c23118503dbdad28fa8ef1fb8ccb.zip |
-rw-r--r-- | src/yuzu/applets/web_browser.cpp | 2 | ||||
-rw-r--r-- | src/yuzu/main.cpp | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/yuzu/applets/web_browser.cpp b/src/yuzu/applets/web_browser.cpp index 6a9138d53..979b9ec14 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 5ab7896d4..619cbd2c2 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -339,6 +339,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(); |