diff options
| author | 2022-12-17 21:07:01 +0000 | |
|---|---|---|
| committer | 2022-12-17 21:07:01 +0000 | |
| commit | f8a7d6a0aeb667c6747e3ee2366c45f547034c23 (patch) | |
| tree | 59bea64a56ad449fd0e743284a53593f6e12443c /src | |
| parent | Merge pull request #9454 from liamwhite/wayland-egl (diff) | |
| parent | qt: avoid setting WA_DontCreateNativeAncestors on all platforms (diff) | |
| download | yuzu-f8a7d6a0aeb667c6747e3ee2366c45f547034c23.tar.gz yuzu-f8a7d6a0aeb667c6747e3ee2366c45f547034c23.tar.xz yuzu-f8a7d6a0aeb667c6747e3ee2366c45f547034c23.zip | |
Merge pull request #9461 from liamwhite/wanative
qt: avoid setting WA_DontCreateNativeAncestors on all platforms
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 896208596..682b37f47 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -44,6 +44,8 @@ | |||
| 44 | #include "yuzu/bootmanager.h" | 44 | #include "yuzu/bootmanager.h" |
| 45 | #include "yuzu/main.h" | 45 | #include "yuzu/main.h" |
| 46 | 46 | ||
| 47 | static Core::Frontend::WindowSystemType GetWindowSystemType(); | ||
| 48 | |||
| 47 | EmuThread::EmuThread(Core::System& system_) : system{system_} {} | 49 | EmuThread::EmuThread(Core::System& system_) : system{system_} {} |
| 48 | 50 | ||
| 49 | EmuThread::~EmuThread() = default; | 51 | EmuThread::~EmuThread() = default; |
| @@ -228,8 +230,10 @@ class RenderWidget : public QWidget { | |||
| 228 | public: | 230 | public: |
| 229 | explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { | 231 | explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { |
| 230 | setAttribute(Qt::WA_NativeWindow); | 232 | setAttribute(Qt::WA_NativeWindow); |
| 231 | setAttribute(Qt::WA_DontCreateNativeAncestors); | ||
| 232 | setAttribute(Qt::WA_PaintOnScreen); | 233 | setAttribute(Qt::WA_PaintOnScreen); |
| 234 | if (GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { | ||
| 235 | setAttribute(Qt::WA_DontCreateNativeAncestors); | ||
| 236 | } | ||
| 233 | } | 237 | } |
| 234 | 238 | ||
| 235 | virtual ~RenderWidget() = default; | 239 | virtual ~RenderWidget() = default; |