Qt: Fix game list glitching out in X11

MetrosexualGarbodor · Jul 17, 2022 · 1cee55b · 1cee55b
1 parent c11ca2f
commit 1cee55b
Show file tree

Hide file tree

Showing 5 changed files with 167 additions and 134 deletions.
diff --git a/pcsx2-qt/DisplayWidget.cpp b/pcsx2-qt/DisplayWidget.cpp
@@ -402,15 +402,24 @@ DisplayContainer::DisplayContainer()
 
 DisplayContainer::~DisplayContainer() = default;
 
-bool DisplayContainer::IsNeeded(bool fullscreen, bool render_to_main)
+bool DisplayContainer::isNeeded(bool fullscreen, bool render_to_main)
 {
 #if defined(_WIN32) || defined(__APPLE__)
 	return false;
 #else
-	if (!fullscreen && render_to_main)
+	if (!isRunningOnWayland())
 		return false;
 
 	// We only need this on Wayland because of client-side decorations...
+	return (fullscreen || !render_to_main);
+#endif
+}
+
+bool DisplayContainer::isRunningOnWayland()
+{
+#if defined(_WIN32) || defined(__APPLE__)
+	return false;
+#else
 	const QString platform_name = QGuiApplication::platformName();
 	return (platform_name == QStringLiteral("wayland"));
 #endif

diff --git a/pcsx2-qt/DisplayWidget.h b/pcsx2-qt/DisplayWidget.h
@@ -75,7 +75,10 @@ class DisplayContainer final : public QStackedWidget
 	DisplayContainer();
 	~DisplayContainer();
 
-	static bool IsNeeded(bool fullscreen, bool render_to_main);
+	// Wayland is broken in lots of ways, so we need to check for it.
+	static bool isRunningOnWayland();
+
+	static bool isNeeded(bool fullscreen, bool render_to_main);
 
 	void setDisplayWidget(DisplayWidget* widget);
 	DisplayWidget* removeDisplayWidget();