diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/qt_common.cpp | 4 | ||||
| -rw-r--r-- | src/yuzu/qt_common.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index d0c72b820..59d226113 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -241,7 +241,7 @@ public: | |||
| 241 | explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { | 241 | explicit RenderWidget(GRenderWindow* parent) : QWidget(parent), render_window(parent) { |
| 242 | setAttribute(Qt::WA_NativeWindow); | 242 | setAttribute(Qt::WA_NativeWindow); |
| 243 | setAttribute(Qt::WA_PaintOnScreen); | 243 | setAttribute(Qt::WA_PaintOnScreen); |
| 244 | if (YuzuQtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { | 244 | if (QtCommon::GetWindowSystemType() == Core::Frontend::WindowSystemType::Wayland) { |
| 245 | setAttribute(Qt::WA_DontCreateNativeAncestors); | 245 | setAttribute(Qt::WA_DontCreateNativeAncestors); |
| 246 | } | 246 | } |
| 247 | } | 247 | } |
| @@ -884,7 +884,7 @@ bool GRenderWindow::InitRenderTarget() { | |||
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | // Update the Window System information with the new render target | 886 | // Update the Window System information with the new render target |
| 887 | window_info = YuzuQtCommon::GetWindowSystemInfo(child_widget->windowHandle()); | 887 | window_info = QtCommon::GetWindowSystemInfo(child_widget->windowHandle()); |
| 888 | 888 | ||
| 889 | child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); | 889 | child_widget->resize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); |
| 890 | layout()->addWidget(child_widget); | 890 | layout()->addWidget(child_widget); |
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp index 6f5bc8d90..76e5b7499 100644 --- a/src/yuzu/configuration/configure_graphics.cpp +++ b/src/yuzu/configuration/configure_graphics.cpp | |||
| @@ -507,7 +507,7 @@ void ConfigureGraphics::RetrieveVulkanDevices() try { | |||
| 507 | using namespace Vulkan; | 507 | using namespace Vulkan; |
| 508 | 508 | ||
| 509 | auto* window = this->window()->windowHandle(); | 509 | auto* window = this->window()->windowHandle(); |
| 510 | auto wsi = YuzuQtCommon::GetWindowSystemInfo(window); | 510 | auto wsi = QtCommon::GetWindowSystemInfo(window); |
| 511 | 511 | ||
| 512 | vk::InstanceDispatch dld; | 512 | vk::InstanceDispatch dld; |
| 513 | const Common::DynamicLibrary library = OpenLibrary(); | 513 | const Common::DynamicLibrary library = OpenLibrary(); |
diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cpp index 1b533ee40..5ac9fe310 100644 --- a/src/yuzu/qt_common.cpp +++ b/src/yuzu/qt_common.cpp | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include <qpa/qplatformnativeinterface.h> | 12 | #include <qpa/qplatformnativeinterface.h> |
| 13 | #endif | 13 | #endif |
| 14 | 14 | ||
| 15 | namespace YuzuQtCommon { | 15 | namespace QtCommon { |
| 16 | Core::Frontend::WindowSystemType GetWindowSystemType() { | 16 | Core::Frontend::WindowSystemType GetWindowSystemType() { |
| 17 | // Determine WSI type based on Qt platform. | 17 | // Determine WSI type based on Qt platform. |
| 18 | QString platform_name = QGuiApplication::platformName(); | 18 | QString platform_name = QGuiApplication::platformName(); |
| @@ -52,4 +52,4 @@ Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window) | |||
| 52 | 52 | ||
| 53 | return wsi; | 53 | return wsi; |
| 54 | } | 54 | } |
| 55 | } // namespace YuzuQtCommon | 55 | } // namespace QtCommon |
diff --git a/src/yuzu/qt_common.h b/src/yuzu/qt_common.h index b366adee6..9c63f08f3 100644 --- a/src/yuzu/qt_common.h +++ b/src/yuzu/qt_common.h | |||
| @@ -6,10 +6,10 @@ | |||
| 6 | #include <QWindow> | 6 | #include <QWindow> |
| 7 | #include "core/frontend/emu_window.h" | 7 | #include "core/frontend/emu_window.h" |
| 8 | 8 | ||
| 9 | namespace YuzuQtCommon { | 9 | namespace QtCommon { |
| 10 | 10 | ||
| 11 | Core::Frontend::WindowSystemType GetWindowSystemType(); | 11 | Core::Frontend::WindowSystemType GetWindowSystemType(); |
| 12 | 12 | ||
| 13 | Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window); | 13 | Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window); |
| 14 | 14 | ||
| 15 | } // namespace YuzuQtCommon | 15 | } // namespace QtCommon |