diff options
Diffstat (limited to 'Source/Core/DolphinQt/RenderWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/RenderWidget.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp index a2c78f242d..a1d0c43c53 100644 --- a/Source/Core/DolphinQt/RenderWidget.cpp +++ b/Source/Core/DolphinQt/RenderWidget.cpp @@ -7,7 +7,6 @@ #include <array> #include <QApplication> -#include <QDesktopWidget> #include <QDragEnterEvent> #include <QDropEvent> #include <QFileInfo> @@ -19,6 +18,7 @@ #include <QPalette> #include <QScreen> #include <QTimer> +#include <QWindow> #include "imgui.h" @@ -43,7 +43,7 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent) setAcceptDrops(true); QPalette p; - p.setColor(QPalette::Background, Qt::black); + p.setColor(QPalette::Window, Qt::black); setPalette(p); connect(Host::GetInstance(), &Host::RequestTitle, this, &RenderWidget::setWindowTitle); @@ -162,8 +162,9 @@ void RenderWidget::showFullScreen() { QWidget::showFullScreen(); - const auto dpr = - QGuiApplication::screens()[QApplication::desktop()->screenNumber(this)]->devicePixelRatio(); + QScreen* screen = window()->windowHandle()->screen(); + + const auto dpr = screen->devicePixelRatio(); emit SizeChanged(width() * dpr, height() * dpr); } @@ -221,14 +222,9 @@ bool RenderWidget::event(QEvent* event) const QResizeEvent* se = static_cast<QResizeEvent*>(event); QSize new_size = se->size(); - auto* desktop = QApplication::desktop(); - - int screen_nr = desktop->screenNumber(this); - - if (screen_nr == -1) - screen_nr = desktop->screenNumber(parentWidget()); + QScreen* screen = window()->windowHandle()->screen(); - const auto dpr = desktop->screen(screen_nr)->devicePixelRatio(); + const auto dpr = screen->devicePixelRatio(); emit SizeChanged(new_size.width() * dpr, new_size.height() * dpr); break; |
