diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2019-03-04 18:24:16 -0500 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2019-03-04 18:26:28 -0500 |
| commit | 4130b07f88a2c23118503dbdad28fa8ef1fb8ccb (patch) | |
| tree | fbaead4c77255ae13879820bd79cc12a62e056d9 /src | |
| parent | 07e13d6728868e5cb91615bec3aa6dfe9ec62b7b (diff) | |
web_browser: Add shortcut to Enter key to exit applet
Addresses issues where a user in fullscreen could not exit some web applets without leaving fullscreen.
Diffstat (limited to 'src')
| -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 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 5ab7896d4e..619cbd2c2b 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(); |