yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #2196 from DarkLordZach/web-applet-esc 

web_browser: Add shortcut to Enter key to exit applet
This commit is contained in:
bunnei 2019-03-07 15:32:32 -05:00 committed by GitHub
parent c63a0e88b7 4130b07f88
commit 3b63a46ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/yuzu/applets/web_browser.cpp
View File

@ -56,6 +56,8 @@ constexpr char NX_SHIM_INJECT_SCRIPT[] = R"(
window.nx.endApplet = function() { window.nx.endApplet = function() {
applet_done = true; applet_done = true;
}; };
window.onkeypress = function(e) { if (e.keyCode === 13) { applet_done = true; } };
)"; )";
QString GetNXShimInjectionScript() { QString GetNXShimInjectionScript() {

5
src/yuzu/main.cpp
View File

@ -340,6 +340,11 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view
.arg(QString::fromStdString(std::to_string(key_code)))); .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; bool running_exit_check = false;
while (!finished) { while (!finished) {
QApplication::processEvents(); QApplication::processEvents();