GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix window dragging when not supported by Wayland compositor

Browse Source 
(cherry picked from commit 3554747a67)
This commit is contained in:
Ari Vuollet
2025-02-02 18:36:03 +02:00
parent 389b2e6148
commit 561239a4b2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp
View File

@@ -310,7 +310,7 @@ namespace WaylandImpl
LOG(Warning, "wl_display_roundtrip_queue failed, errno: {}", errno); LOG(Warning, "wl_display_roundtrip_queue failed, errno: {}", errno);
// Wait until window has showed up // Wait until window has showed up
if (wrappedToplevel == nullptr && dragWindow && Platform::AtomicRead(&WaitFlag) != 0) if (DragManager != nullptr && wrappedToplevel == nullptr && dragWindow && Platform::AtomicRead(&WaitFlag) != 0)
{ {
auto toplevel = static_cast<xdg_toplevel*>(SDL_GetPointerProperty(SDL_GetWindowProperties(draggedWindow), SDL_PROP_WINDOW_WAYLAND_XDG_TOPLEVEL_POINTER, nullptr)); auto toplevel = static_cast<xdg_toplevel*>(SDL_GetPointerProperty(SDL_GetWindowProperties(draggedWindow), SDL_PROP_WINDOW_WAYLAND_XDG_TOPLEVEL_POINTER, nullptr));
if (toplevel != nullptr) if (toplevel != nullptr)
@@ -1431,7 +1431,11 @@ DragDropEffect SDLWindow::DoDragDrop(const StringView& data, const Float2& offse
else else
SDL_ShowWindow(_window); SDL_ShowWindow(_window);
} }
WindowBase::Show(); // Only show the window if toplevel dragging is supported
if (WaylandImpl::DragManager != nullptr)
WindowBase::Show();
else
Hide();
WaylandImpl::DraggingWindow = true; WaylandImpl::DraggingWindow = true;
DoDragDropWayland(String(""), dragSourceWindow, dragOffset); DoDragDropWayland(String(""), dragSourceWindow, dragOffset);