piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9323 from waddlesplash/haiku

Browse Source 
Rehabilitate Haiku support.
This commit is contained in:
Léo Lam
2021-01-05 16:09:43 +01:00
committed by GitHub
parent 840ecfb32f 2df11d3911
commit eafb9de047
10 changed files with 155 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -154,6 +154,8 @@ static WindowSystemType GetWindowSystemType()
return WindowSystemType::X11;
else if (platform_name == QStringLiteral("wayland"))
return WindowSystemType::Wayland;
else if (platform_name == QStringLiteral("haiku"))
return WindowSystemType::Haiku;
ModalMessageBox::critical(
nullptr, QStringLiteral("Error"),
@ -167,7 +169,7 @@ static WindowSystemInfo GetWindowSystemInfo(QWindow* window)
wsi.type = GetWindowSystemType();
// Our Win32 Qt external doesn't have the private API.
#if defined(WIN32) || defined(__APPLE__)
#if defined(WIN32) || defined(__APPLE__) || defined(__HAIKU__)
wsi.render_window = window ? reinterpret_cast<void*>(window->winId()) : nullptr;
wsi.render_surface = wsi.render_window;
#else