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

_wayland cleaned for good?
Some checks are pending
Build Android / Game (Android, Release ARM64) (push) Waiting to run
Details
Build iOS / Game (iOS, Release ARM64) (push) Waiting to run
Details
Build Linux / Editor (Linux, Development x64) (push) Waiting to run
Details
Build Linux / Game (Linux, Release x64) (push) Waiting to run
Details
Build macOS / Editor (Mac, Development ARM64) (push) Waiting to run
Details
Build macOS / Game (Mac, Release ARM64) (push) Waiting to run
Details
Build Windows / Editor (Windows, Development x64) (push) Waiting to run
Details
Build Windows / Game (Windows, Release x64) (push) Waiting to run
Details
Cooker / Cook (Mac) (push) Waiting to run
Details
Tests / Tests (Linux) (push) Waiting to run
Details
Tests / Tests (Windows) (push) Waiting to run
Details

Browse Source
This commit is contained in:
Ari Vuollet
2025-01-28 01:49:22 +02:00
parent 55de3f8fd3
commit 7823518fe4
1 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,37 +551,7 @@ DragDropEffect Window::DoDragDropWayland(const StringView& data, Window* dragSou
// For drag-and-drop, we need to run another event queue in a separate thread to avoid racing issues
// while SDL is dispatching the main Wayland event queue when receiving the data offer from us.
// Show the window without changing the focus
//Show();
if (!_visible)
{
if (_showAfterFirstPaint)
{
if (RenderTask)
RenderTask->Enabled = true;
}
else
SDL_ShowWindow(_window);
}
WindowBase::Show();
/*{
const double time = Platform::GetTimeSeconds();
// Update game logic
if (Time::OnBeginUpdate(time))
{
Engine::OnUpdate();
Engine::OnLateUpdate();
Time::OnEndUpdate();
}
SDLPlatform::Tick();
Engine::OnDraw();
Platform::Sleep(1);
}*/
Engine::OnDraw();
WaylandImpl::DraggingActive = true;
WaylandImpl::DraggingData = StringView(data.Get(), data.Length());
@@ -602,14 +572,11 @@ DragDropEffect Window::DoDragDropWayland(const StringView& data, Window* dragSou
{
SDLPlatform::Tick();
Engine::OnUpdate();//Scripting::Update(); // For docking updates
//if (Platform::AtomicRead(&task->WaitFlag) == 1)
Engine::OnDraw();
Engine::OnDraw();
// The window needs to be finished showing up before we can start dragging it
if (IsVisible() && Platform::AtomicRead(&task->WaitFlag) == 0)
{
Platform::AtomicStore(&task->WaitFlag, 1);
}
Platform::Sleep(1);
}
@@ -1472,11 +1439,23 @@ DragDropEffect SDLWindow::DoDragDrop(const StringView& data, const Float2& offse
float topOffset = 25.0f;
dragOffset += Float2(0.0f, topOffset);
}
// Show the window without changing focus
if (!_visible)
{
if (_showAfterFirstPaint)
{
if (RenderTask)
RenderTask->Enabled = true;
}
else
SDL_ShowWindow(_window);
}
WindowBase::Show();
WaylandImpl::DraggingWindow = true;
DoDragDropWayland(String(""), dragSourceWindow, dragOffset);
WaylandImpl::DraggingWindow = false;
//Show();
}
else
Show();