Cleanup

2025-07-03 20:21:30 +03:00
parent aab0d772a4
commit 28980e5fbf
26 changed files with 49 additions and 50 deletions
--- a/Source/Editor/GUI/Docking/WindowDragHelper.cs
+++ b/Source/Editor/GUI/Docking/WindowDragHelper.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System;
 using FlaxEngine;
--- a/Source/Engine/Platform/Base/Enums.h
+++ b/Source/Engine/Platform/Base/Enums.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/Base/ScreenUtilitiesBase.h
+++ b/Source/Engine/Platform/Base/ScreenUtilitiesBase.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/Linux/LinuxScreenUtilities.cpp
+++ b/Source/Engine/Platform/Linux/LinuxScreenUtilities.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_LINUX

@@ -15,11 +15,7 @@
 #if PLATFORM_SDL
 #include <libportal/portal-enums.h>
 #include <libportal/screenshot.h>
-#endif

-Delegate<Color32> ScreenUtilitiesBase::PickColorDone;
-
-#if PLATFORM_SDL
 namespace PortalImpl
 {
    XdpPortal* Portal = nullptr;
@@ -30,6 +26,8 @@ namespace PortalImpl
 }
 #endif

+Delegate<Color32> ScreenUtilitiesBase::PickColorDone;
+
 Color32 LinuxScreenUtilities::GetColorAt(const Float2& pos)
 {
    X11::Display* display = (X11::Display*)Platform::GetXDisplay();
@@ -125,6 +123,7 @@ void LinuxScreenUtilities::PickColor()
 }

 #if PLATFORM_SDL
+
 gpointer PortalImpl::GLibMainLoop(gpointer data)
 {
    GMainContext* mainContext = g_main_context_get_thread_default();
--- a/Source/Engine/Platform/Linux/LinuxScreenUtilities.h
+++ b/Source/Engine/Platform/Linux/LinuxScreenUtilities.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

@@ -7,7 +7,6 @@
 #include "Engine/Platform/Base/ScreenUtilitiesBase.h"
 #include "Engine/Core/Types/BaseTypes.h"
 #include "Engine/Core/Math/Color32.h"
-#include "Engine/Core/Math/Vector2.h"
 #include "Engine/Core/Delegate.h"

 /// <summary>
--- a/Source/Engine/Platform/Mac/MacScreenUtilities.cpp
+++ b/Source/Engine/Platform/Mac/MacScreenUtilities.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if USE_EDITOR && PLATFORM_MAC

--- a/Source/Engine/Platform/Mac/MacScreenUtilities.h
+++ b/Source/Engine/Platform/Mac/MacScreenUtilities.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/SDL/SDLClipboard.h
+++ b/Source/Engine/Platform/SDL/SDLClipboard.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/SDL/SDLInput.cpp
+++ b/Source/Engine/Platform/SDL/SDLInput.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL

--- a/Source/Engine/Platform/SDL/SDLInput.h
+++ b/Source/Engine/Platform/SDL/SDLInput.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp
+++ b/Source/Engine/Platform/SDL/SDLPlatform.Linux.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL && PLATFORM_LINUX

--- a/Source/Engine/Platform/SDL/SDLPlatform.Mac.cpp
+++ b/Source/Engine/Platform/SDL/SDLPlatform.Mac.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL && PLATFORM_MAC

--- a/Source/Engine/Platform/SDL/SDLPlatform.Windows.cpp
+++ b/Source/Engine/Platform/SDL/SDLPlatform.Windows.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL && PLATFORM_WINDOWS

@@ -111,29 +111,30 @@ bool SDLPlatform::EventFilterCallback(void* userdata, SDL_Event* event)
    else if (event->type == SDL_EVENT_WINDOW_MOVED)
    {
        if (window)
+        {
            window->HandleEvent(*event);

-        if (WinImpl::DraggedWindowSize != window->GetClientSize())
-        {
-            // The window size changed while dragging, most likely due to maximized window restoring back to previous size.
-            WinImpl::DraggedWindowMousePosition = WinImpl::DraggedWindowStartPosition + WinImpl::DraggedWindowMousePosition - window->GetClientPosition();
-            WinImpl::DraggedWindowStartPosition = window->GetClientPosition();
-            WinImpl::DraggedWindowSize = window->GetClientSize();
-        }
-        Float2 windowPosition = Float2(static_cast<float>(event->window.data1), static_cast<float>(event->window.data2));
-        Float2 mousePosition = WinImpl::DraggedWindowMousePosition;
+            Float2 windowSize = window->GetClientSize();
+            if (WinImpl::DraggedWindowSize != windowSize)
+            {
+                // The window size changed while dragging, most likely due to maximized window restoring back to previous size.
+                WinImpl::DraggedWindowMousePosition = WinImpl::DraggedWindowStartPosition + WinImpl::DraggedWindowMousePosition - window->GetClientPosition();
+                WinImpl::DraggedWindowStartPosition = window->GetClientPosition();
+                WinImpl::DraggedWindowSize = windowSize;
+            }
+            Float2 windowPosition = Float2(static_cast<float>(event->window.data1), static_cast<float>(event->window.data2));
+            Float2 mousePosition = WinImpl::DraggedWindowMousePosition;

-        // Generate mouse movement events while dragging the window around
-        SDL_Event mouseMovedEvent { 0 };
-        mouseMovedEvent.motion.type = SDL_EVENT_MOUSE_MOTION;
-        mouseMovedEvent.motion.windowID = SDL_GetWindowID(WinImpl::DraggedWindow->GetSDLWindow());
-        mouseMovedEvent.motion.timestamp = SDL_GetTicksNS();
-        mouseMovedEvent.motion.state = SDL_BUTTON_LEFT;
-        mouseMovedEvent.motion.x = mousePosition.X;
-        mouseMovedEvent.motion.y = mousePosition.Y;
-        if (window)
+            // Generate mouse movement events while dragging the window around
+            SDL_Event mouseMovedEvent{ 0 };
+            mouseMovedEvent.motion.type = SDL_EVENT_MOUSE_MOTION;
+            mouseMovedEvent.motion.windowID = SDL_GetWindowID(WinImpl::DraggedWindow->GetSDLWindow());
+            mouseMovedEvent.motion.timestamp = SDL_GetTicksNS();
+            mouseMovedEvent.motion.state = SDL_BUTTON_LEFT;
+            mouseMovedEvent.motion.x = mousePosition.X;
+            mouseMovedEvent.motion.y = mousePosition.Y;
            window->HandleEvent(mouseMovedEvent);
-
+        }
        return false;
    }
    if (window)
--- a/Source/Engine/Platform/SDL/SDLPlatform.cpp
+++ b/Source/Engine/Platform/SDL/SDLPlatform.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL

--- a/Source/Engine/Platform/SDL/SDLPlatform.h
+++ b/Source/Engine/Platform/SDL/SDLPlatform.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/SDL/SDLWindow.cpp
+++ b/Source/Engine/Platform/SDL/SDLWindow.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_SDL

--- a/Source/Engine/Platform/SDL/SDLWindow.h
+++ b/Source/Engine/Platform/SDL/SDLWindow.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/ScreenUtilities.h
+++ b/Source/Engine/Platform/ScreenUtilities.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/Windows/WindowsScreenUtilities.cpp
+++ b/Source/Engine/Platform/Windows/WindowsScreenUtilities.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_WINDOWS

--- a/Source/Engine/Platform/Windows/WindowsScreenUtilities.h
+++ b/Source/Engine/Platform/Windows/WindowsScreenUtilities.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
+++ b/Source/Engine/Platform/Windows/WindowsWindow.DragDrop.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 #if PLATFORM_WINDOWS

--- a/Source/ThirdParty/SDL/SDL.Build.cs
+++ b/Source/ThirdParty/SDL/SDL.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System.IO;
 using Flax.Build;
--- a/Source/ThirdParty/Wayland/Wayland.Build.cs
+++ b/Source/ThirdParty/Wayland/Wayland.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;
--- a/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/SDL.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System;
 using System.Collections.Generic;
--- a/Source/Tools/Flax.Build/Deps/Dependencies/Wayland.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/Wayland.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;
--- a/Source/Tools/Flax.Build/Deps/Dependencies/libportal.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/libportal.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
+// Copyright (c) Wojciech Figat. All rights reserved.

 using System.Collections.Generic;
 using System.IO;