ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6764 from spycrab/qt_fix_rtm 

Qt: Fix "Render To Main"
This commit is contained in:
Markus Wick 2018-05-07 17:33:56 +02:00 committed by GitHub
parent a7cc1044fa 6f65238efc
commit 6f0ad84a5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/Config/Graphics/GeneralWidget.cpp
View File

@ -212,6 +212,8 @@ void GeneralWidget::SaveSettings()
SConfig::GetInstance().bFullscreen = m_enable_fullscreen->isChecked();
// Autoadjust window size
SConfig::GetInstance().bRenderWindowAutoSize = m_autoadjust_window_size->isChecked();
// Render To Main
SConfig::GetInstance().bRenderToMain = m_render_main_window->isChecked();
}
void GeneralWidget::OnEmulationStateChanged(bool running)

10
Source/Core/DolphinQt2/RenderWidget.cpp
View File

@ -158,8 +158,14 @@ bool RenderWidget::event(QEvent* event)
const QResizeEvent* se = static_cast<QResizeEvent*>(event);
QSize new_size = se->size();
const auto dpr =
QGuiApplication::screens()[QApplication::desktop()->screenNumber(this)]->devicePixelRatio();
auto* desktop = QApplication::desktop();
int screen_nr = desktop->screenNumber(this);
if (screen_nr == -1)
screen_nr = desktop->screenNumber(parentWidget());
const auto dpr = desktop->screen(screen_nr)->devicePixelRatio();
emit SizeChanged(new_size.width() * dpr, new_size.height() * dpr);
break;