Forráskód Böngészése

qt: use main window as close overlay parent

Liam 3 éve
szülő
commit
ae6015a69b
2 módosított fájl, 4 hozzáadás és 4 törlés
  1. 2 3
      src/yuzu/main.cpp
  2. 2 1
      src/yuzu/util/overlay_dialog.cpp

+ 2 - 3
src/yuzu/main.cpp

@@ -1815,9 +1815,8 @@ void GMainWindow::OnShutdownBegin() {
 }
 }
 
 
 void GMainWindow::OnShutdownBeginDialog() {
 void GMainWindow::OnShutdownBeginDialog() {
-    shutdown_dialog =
-        new OverlayDialog(render_window, *system, QString{}, tr("Closing software..."), QString{},
-                          QString{}, Qt::AlignHCenter | Qt::AlignVCenter);
+    shutdown_dialog = new OverlayDialog(this, *system, QString{}, tr("Closing software..."),
+                                        QString{}, QString{}, Qt::AlignHCenter | Qt::AlignVCenter);
     shutdown_dialog->open();
     shutdown_dialog->open();
 }
 }
 
 

+ 2 - 1
src/yuzu/util/overlay_dialog.cpp

@@ -3,6 +3,7 @@
 
 
 #include <QKeyEvent>
 #include <QKeyEvent>
 #include <QScreen>
 #include <QScreen>
+#include <QWindow>
 
 
 #include "core/core.h"
 #include "core/core.h"
 #include "core/hid/hid_types.h"
 #include "core/hid/hid_types.h"
@@ -162,7 +163,7 @@ void OverlayDialog::MoveAndResizeWindow() {
     const auto height = static_cast<float>(parentWidget()->height());
     const auto height = static_cast<float>(parentWidget()->height());
 
 
     // High DPI
     // High DPI
-    const float dpi_scale = qApp->screenAt(pos)->logicalDotsPerInch() / 96.0f;
+    const float dpi_scale = parentWidget()->windowHandle()->screen()->logicalDotsPerInch() / 96.0f;
 
 
     const auto title_text_font_size = BASE_TITLE_FONT_SIZE * (height / BASE_HEIGHT) / dpi_scale;
     const auto title_text_font_size = BASE_TITLE_FONT_SIZE * (height / BASE_HEIGHT) / dpi_scale;
     const auto body_text_font_size =
     const auto body_text_font_size =