From 5f4802828470ba01aceceede1f37906103d7c321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B3pez=20Guimaraes?= <danielectra@outlook.com>
Date: Sat, 28 Dec 2024 22:19:17 +0000
Subject: [PATCH] Qt: Fix Wayland support

Qt will only create a Wayland surface when show() is called on the main
window and on the ScreenWidget. Thus, call the function before creating
the GL context.

Doesn't cause regressions on XWayland, untested in other platforms.

Fixes #586
---
 src/panda_qt/main.cpp        | 1 -
 src/panda_qt/main_window.cpp | 3 ++-
 src/panda_qt/screen.cpp      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/panda_qt/main.cpp b/src/panda_qt/main.cpp
index a7a6216c5..4ab737b05 100644
--- a/src/panda_qt/main.cpp
+++ b/src/panda_qt/main.cpp
@@ -7,6 +7,5 @@ int main(int argc, char *argv[]) {
 	QApplication app(argc, argv);
 	MainWindow window(&app);
 
-	window.show();
 	return app.exec();
 }
diff --git a/src/panda_qt/main_window.cpp b/src/panda_qt/main_window.cpp
index dffe5ca0f..abb695ca4 100644
--- a/src/panda_qt/main_window.cpp
+++ b/src/panda_qt/main_window.cpp
@@ -22,6 +22,7 @@ MainWindow::MainWindow(QApplication* app, QWidget* parent) : QMainWindow(parent)
 	// Enable drop events for loading ROMs
 	setAcceptDrops(true);
 	resize(800, 240 * 4);
+	show();
 
 	// We pass a callback to the screen widget that will be triggered every time we resize the screen
 	screen = new ScreenWidget([this](u32 width, u32 height) { handleScreenResize(width, height); }, this);
@@ -699,4 +700,4 @@ void MainWindow::setupControllerSensors(SDL_GameController* controller) {
 	if (haveAccelerometer) {
 		SDL_GameControllerSetSensorEnabled(controller, SDL_SENSOR_ACCEL, SDL_TRUE);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/panda_qt/screen.cpp b/src/panda_qt/screen.cpp
index 919b66943..fc7836832 100644
--- a/src/panda_qt/screen.cpp
+++ b/src/panda_qt/screen.cpp
@@ -29,6 +29,7 @@ ScreenWidget::ScreenWidget(ResizeCallback resizeCallback, QWidget* parent) : QWi
 	setAttribute(Qt::WA_KeyCompression, false);
 	setFocusPolicy(Qt::StrongFocus);
 	setMouseTracking(true);
+	show();
 
 	if (!createGLContext()) {
 		Helpers::panic("Failed to create GL context for display");
@@ -84,7 +85,7 @@ bool ScreenWidget::createGLContext() {
 }
 
 qreal ScreenWidget::devicePixelRatioFromScreen() const {
-	const QScreen* screenForRatio = window()->windowHandle()->screen();
+	const QScreen* screenForRatio = windowHandle()->screen();
 	if (!screenForRatio) {
 		screenForRatio = QGuiApplication::primaryScreen();
 	}