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

Qt: Only apply non-visible window info rule for X11 

Again, DInput needs the main window, even if it's not visible.
This commit is contained in:
Stenzek 2023-01-02 12:42:24 +10:00 committed by refractionpcsx2
parent f96ad8ff6e
commit 3ed489f35c
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcsx2-qt/QtUtils.cpp
View File

@ -224,12 +224,6 @@ namespace QtUtils
std::optional<WindowInfo> GetWindowInfoForWidget(QWidget* widget) std::optional<WindowInfo> GetWindowInfoForWidget(QWidget* widget)
{ {
if (!widget->isVisible())
{
Console.WriteLn("Returning null window info for widget because it is not visible.");
return std::nullopt;
}
WindowInfo wi; WindowInfo wi;
// Windows and Apple are easy here since there's no display connection. // Windows and Apple are easy here since there's no display connection.
@ -244,6 +238,13 @@ namespace QtUtils
const QString platform_name = QGuiApplication::platformName(); const QString platform_name = QGuiApplication::platformName();
if (platform_name == QStringLiteral("xcb")) if (platform_name == QStringLiteral("xcb"))
{ {
// Can't get a handle for an unmapped window in X, it doesn't like it.
if (!widget->isVisible())
{
Console.WriteLn("Returning null window info for widget because it is not visible.");
return std::nullopt;
}
wi.type = WindowInfo::Type::X11; wi.type = WindowInfo::Type::X11;
wi.display_connection = pni->nativeResourceForWindow("display", widget->windowHandle()); wi.display_connection = pni->nativeResourceForWindow("display", widget->windowHandle());
wi.window_handle = reinterpret_cast<void*>(widget->winId()); wi.window_handle = reinterpret_cast<void*>(widget->winId());