piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Externals/Qt: Update to 5.13.1

Browse Source
This commit is contained in:
spycrab
2019-10-13 03:36:17 +02:00
parent 6dbb5cc4ea
commit ec526fee56
6 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/DolphinQt/RenderWidget.cpp
View File

@ -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();
QScreen* screen = window()->windowHandle()->screen();
int screen_nr = desktop->screenNumber(this);
if (screen_nr == -1)
screen_nr = desktop->screenNumber(parentWidget());
const auto dpr = desktop->screen(screen_nr)->devicePixelRatio();
const auto dpr = screen->devicePixelRatio();
emit SizeChanged(new_size.width() * dpr, new_size.height() * dpr);
break;