diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 7 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 1a47fb9c9..7c8922841 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -269,12 +269,14 @@ static Core::Frontend::WindowSystemType GetWindowSystemType() { | |||
| 269 | return Core::Frontend::WindowSystemType::X11; | 269 | return Core::Frontend::WindowSystemType::X11; |
| 270 | else if (platform_name == QStringLiteral("wayland")) | 270 | else if (platform_name == QStringLiteral("wayland")) |
| 271 | return Core::Frontend::WindowSystemType::Wayland; | 271 | return Core::Frontend::WindowSystemType::Wayland; |
| 272 | else if (platform_name == QStringLiteral("wayland-egl")) | ||
| 273 | return Core::Frontend::WindowSystemType::Wayland; | ||
| 272 | else if (platform_name == QStringLiteral("cocoa")) | 274 | else if (platform_name == QStringLiteral("cocoa")) |
| 273 | return Core::Frontend::WindowSystemType::Cocoa; | 275 | return Core::Frontend::WindowSystemType::Cocoa; |
| 274 | else if (platform_name == QStringLiteral("android")) | 276 | else if (platform_name == QStringLiteral("android")) |
| 275 | return Core::Frontend::WindowSystemType::Android; | 277 | return Core::Frontend::WindowSystemType::Android; |
| 276 | 278 | ||
| 277 | LOG_CRITICAL(Frontend, "Unknown Qt platform!"); | 279 | LOG_CRITICAL(Frontend, "Unknown Qt platform {}!", platform_name.toStdString()); |
| 278 | return Core::Frontend::WindowSystemType::Windows; | 280 | return Core::Frontend::WindowSystemType::Windows; |
| 279 | } | 281 | } |
| 280 | 282 | ||
| @@ -314,7 +316,8 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, | |||
| 314 | input_subsystem->Initialize(); | 316 | input_subsystem->Initialize(); |
| 315 | this->setMouseTracking(true); | 317 | this->setMouseTracking(true); |
| 316 | 318 | ||
| 317 | strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland"); | 319 | strict_context_required = QGuiApplication::platformName() == QStringLiteral("wayland") || |
| 320 | QGuiApplication::platformName() == QStringLiteral("wayland-egl"); | ||
| 318 | 321 | ||
| 319 | connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); | 322 | connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); |
| 320 | connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, | 323 | connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 885e24990..e68b4f799 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -2917,7 +2917,8 @@ static QScreen* GuessCurrentScreen(QWidget* window) { | |||
| 2917 | 2917 | ||
| 2918 | bool GMainWindow::UsingExclusiveFullscreen() { | 2918 | bool GMainWindow::UsingExclusiveFullscreen() { |
| 2919 | return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive || | 2919 | return Settings::values.fullscreen_mode.GetValue() == Settings::FullscreenMode::Exclusive || |
| 2920 | QGuiApplication::platformName() == QStringLiteral("wayland"); | 2920 | QGuiApplication::platformName() == QStringLiteral("wayland") || |
| 2921 | QGuiApplication::platformName() == QStringLiteral("wayland-egl"); | ||
| 2921 | } | 2922 | } |
| 2922 | 2923 | ||
| 2923 | void GMainWindow::ShowFullscreen() { | 2924 | void GMainWindow::ShowFullscreen() { |