diff options
| author | Ameer <aj662@drexel.edu> | 2020-07-07 01:45:57 +0200 |
|---|---|---|
| committer | Ameer <aj662@drexel.edu> | 2020-07-07 01:45:57 +0200 |
| commit | 40cf9288e9814d022bfbe247d1948e08c1a655d6 (patch) | |
| tree | 88265573414ac59d35fede9377ab96042b0b07eb | |
| parent | Revert inadvertent dynarmic update (diff) | |
| download | yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.gz yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.bz2 yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.lz yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.xz yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.tar.zst yuzu-40cf9288e9814d022bfbe247d1948e08c1a655d6.zip | |
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 9e6125e18..5e0d0e7af 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -220,8 +220,8 @@ const std::array<UISettings::Shortcut, 16> Config::default_hotkeys{{ {QStringLiteral("Exit yuzu"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), Qt::WindowShortcut}}, {QStringLiteral("Increase Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("+"), Qt::ApplicationShortcut}}, - {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::ApplicationShortcut}}, - {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WindowShortcut}}, + {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::WidgetWithChildrenShortcut}}, + {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WidgetWithChildrenShortcut}}, {QStringLiteral("Mute Audio"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+M"), Qt::WindowShortcut}}, {QStringLiteral("Restart Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F6"), Qt::WindowShortcut}}, {QStringLiteral("Stop Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F5"), Qt::WindowShortcut}}, @@ -666,8 +666,8 @@ void Config::ReadShortcutValues() { qt_config->beginGroup(group); qt_config->beginGroup(name); // No longer using ReadSetting for shortcut.second as it innacurately returns a value of 1 - // for WidgetWithChildrenShortcut which is a value of 3. Needed to fix screenshot shortcut - // in windowed mode + // for WidgetWithChildrenShortcut which is a value of 3. Needed to fix shortcuts the open + // a file dialog in windowed mode UISettings::values.shortcuts.push_back( {name, group, |