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

Refactor application window class name

Browse Source
This commit is contained in:
Ari Vuollet
2024-07-25 22:32:00 +03:00
committed by Ari Vuollet
parent bb47c638f1
commit 6cde5e9376
8 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Engine/Platform/Base/PlatformBase.cpp
View File

@@ -45,6 +45,7 @@ static_assert(sizeof(double) == 8, "Invalid double type size.");
static_assert((PLATFORM_THREADS_LIMIT & (PLATFORM_THREADS_LIMIT - 1)) == 0, "Threads limit must be power of two."); static_assert((PLATFORM_THREADS_LIMIT & (PLATFORM_THREADS_LIMIT - 1)) == 0, "Threads limit must be power of two.");
static_assert(PLATFORM_THREADS_LIMIT % 4 == 0, "Threads limit must be multiple of 4."); static_assert(PLATFORM_THREADS_LIMIT % 4 == 0, "Threads limit must be multiple of 4.");
const Char* PlatformBase::ApplicationClassName = TEXT("FlaxWindow");
float PlatformBase::CustomDpiScale = 1.0f; float PlatformBase::CustomDpiScale = 1.0f;
Array<User*, FixedAllocation<8>> PlatformBase::Users; Array<User*, FixedAllocation<8>> PlatformBase::Users;
Delegate<User*> PlatformBase::UserAdded; Delegate<User*> PlatformBase::UserAdded;

7
Source/Engine/Platform/Base/PlatformBase.h
View File

@@ -190,6 +190,13 @@ DECLARE_SCRIPTING_TYPE_MINIMAL(PlatformBase);
/// </summary> /// </summary>
static void Exit(); static void Exit();
public:
/// <summary>
/// Application windows class name.
/// </summary>
static const Char* ApplicationClassName;
public: public:
/// <summary> /// <summary>
/// Copy memory region /// Copy memory region

5
Source/Engine/Platform/GDK/GDKPlatform.cpp
View File

@@ -30,7 +30,6 @@ inline bool operator==(const APP_LOCAL_DEVICE_ID& l, const APP_LOCAL_DEVICE_ID&
return Platform::MemoryCompare(&l, &r, sizeof(APP_LOCAL_DEVICE_ID)) == 0; return Platform::MemoryCompare(&l, &r, sizeof(APP_LOCAL_DEVICE_ID)) == 0;
} }
const Char* GDKPlatform::ApplicationWindowClass = TEXT("FlaxWindow");
void* GDKPlatform::Instance = nullptr; void* GDKPlatform::Instance = nullptr;
Delegate<> GDKPlatform::Suspended; Delegate<> GDKPlatform::Suspended;
Delegate<> GDKPlatform::Resumed; Delegate<> GDKPlatform::Resumed;
@@ -317,7 +316,7 @@ void GDKPlatform::PreInit(void* hInstance)
windowsClass.style = CS_HREDRAW | CS_VREDRAW; windowsClass.style = CS_HREDRAW | CS_VREDRAW;
windowsClass.lpfnWndProc = WndProc; windowsClass.lpfnWndProc = WndProc;
windowsClass.hInstance = (HINSTANCE)Instance; windowsClass.hInstance = (HINSTANCE)Instance;
windowsClass.lpszClassName = ApplicationWindowClass; windowsClass.lpszClassName = ApplicationClassName;
if (!RegisterClassW(&windowsClass)) if (!RegisterClassW(&windowsClass))
{ {
Error(TEXT("Window class registration failed!")); Error(TEXT("Window class registration failed!"));
@@ -477,7 +476,7 @@ void GDKPlatform::Exit()
if (PlmSignalResume) if (PlmSignalResume)
CloseHandle(PlmSignalResume); CloseHandle(PlmSignalResume);
UnregisterClassW(ApplicationWindowClass, nullptr); UnregisterClassW(ApplicationClassName, nullptr);
XGameRuntimeUninitialize(); XGameRuntimeUninitialize();
} }

5
Source/Engine/Platform/GDK/GDKPlatform.h
View File

@@ -13,11 +13,6 @@ class FLAXENGINE_API GDKPlatform : public Win32Platform
{ {
public: public:
/// <summary>
/// Win32 application windows class name.
/// </summary>
static const Char* ApplicationWindowClass;
/// <summary> /// <summary>
/// Handle to Win32 application instance. /// Handle to Win32 application instance.
/// </summary> /// </summary>

2
Source/Engine/Platform/GDK/GDKWindow.cpp
View File

@@ -71,7 +71,7 @@ GDKWindow::GDKWindow(const CreateWindowSettings& settings)
// Creating the window // Creating the window
_handle = CreateWindowExW( _handle = CreateWindowExW(
exStyle, exStyle,
Platform::ApplicationWindowClass, Platform::ApplicationClassName,
settings.Title.GetText(), settings.Title.GetText(),
style, style,
x, x,

5
Source/Engine/Platform/Windows/WindowsPlatform.cpp
View File

@@ -34,7 +34,6 @@
#define CLR_EXCEPTION 0xE0434352 #define CLR_EXCEPTION 0xE0434352
#define VCPP_EXCEPTION 0xE06D7363 #define VCPP_EXCEPTION 0xE06D7363
const Char* WindowsPlatform::ApplicationWindowClass = TEXT("FlaxWindow");
void* WindowsPlatform::Instance = nullptr; void* WindowsPlatform::Instance = nullptr;
#if CRASH_LOG_ENABLE || TRACY_ENABLE #if CRASH_LOG_ENABLE || TRACY_ENABLE
@@ -528,7 +527,7 @@ void WindowsPlatform::PreInit(void* hInstance)
windowsClass.hInstance = (HINSTANCE)Instance; windowsClass.hInstance = (HINSTANCE)Instance;
windowsClass.hIcon = LoadIconW(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDR_MAINFRAME)); windowsClass.hIcon = LoadIconW(GetModuleHandle(nullptr), MAKEINTRESOURCE(IDR_MAINFRAME));
windowsClass.hCursor = LoadCursor(nullptr, IDC_ARROW); windowsClass.hCursor = LoadCursor(nullptr, IDC_ARROW);
windowsClass.lpszClassName = ApplicationWindowClass; windowsClass.lpszClassName = ApplicationClassName;
if (!RegisterClassW(&windowsClass)) if (!RegisterClassW(&windowsClass))
{ {
Error(TEXT("Window class registration failed!")); Error(TEXT("Window class registration failed!"));
@@ -780,7 +779,7 @@ void WindowsPlatform::Exit()
#endif #endif
// Unregister app class // Unregister app class
UnregisterClassW(ApplicationWindowClass, nullptr); UnregisterClassW(ApplicationClassName, nullptr);
Win32Platform::Exit(); Win32Platform::Exit();
} }

5
Source/Engine/Platform/Windows/WindowsPlatform.h
View File

@@ -13,11 +13,6 @@ class FLAXENGINE_API WindowsPlatform : public Win32Platform
{ {
public: public:
/// <summary>
/// Win32 application windows class name.
/// </summary>
static const Char* ApplicationWindowClass;
/// <summary> /// <summary>
/// Handle to Win32 application instance. /// Handle to Win32 application instance.
/// </summary> /// </summary>

2
Source/Engine/Platform/Windows/WindowsWindow.cpp
View File

@@ -120,7 +120,7 @@ WindowsWindow::WindowsWindow(const CreateWindowSettings& settings)
// Creating the window // Creating the window
_handle = CreateWindowExW( _handle = CreateWindowExW(
exStyle, exStyle,
Platform::ApplicationWindowClass, Platform::ApplicationClassName,
settings.Title.GetText(), settings.Title.GetText(),
style, style,
x, x,