Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix window title (everything use unicode)

Browse Source
This commit is contained in:
Patedam
2025-02-19 22:12:02 -05:00
parent 8326772558
commit f83a238473
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Juliet/src/Core/HAL/Display/Win32/Win32DisplayEvent.cpp
View File

@@ -155,7 +155,7 @@ namespace Juliet::Win32
auto* windowState = GetWindowStateFromHandle(handle); auto* windowState = GetWindowStateFromHandle(handle);
if (!windowState) if (!windowState)
{ {
return CallWindowProcA(DefWindowProcA, handle, message, wParam, lParam); return CallWindowProc(DefWindowProc, handle, message, wParam, lParam);
} }
switch (message) switch (message)
@@ -267,6 +267,6 @@ namespace Juliet::Win32
return returnCode; return returnCode;
} }
return CallWindowProcA(DefWindowProcA, handle, message, wParam, lParam); return CallWindowProc(DefWindowProc, handle, message, wParam, lParam);
} }
} // namespace Juliet::Win32 } // namespace Juliet::Win32

8
Juliet/src/Core/HAL/Display/Win32/Win32Window.cpp
View File

@@ -9,7 +9,7 @@ namespace Juliet::Win32
{ {
namespace namespace
{ {
constexpr auto WindowClassName = L"JulietWindowClass"; constexpr auto WindowClassName = L"JulietWindowClass";
constexpr LPCWSTR WindowClassPtr = WindowClassName; constexpr LPCWSTR WindowClassPtr = WindowClassName;
bool SetupWindowState(NonNullPtr<DisplayDevice> self, NonNullPtr<Window> window, HWND handle) bool SetupWindowState(NonNullPtr<DisplayDevice> self, NonNullPtr<Window> window, HWND handle)
@@ -43,10 +43,10 @@ namespace Juliet::Win32
bool CreatePlatformWindow(NonNullPtr<DisplayDevice> self, NonNullPtr<Window> window) bool CreatePlatformWindow(NonNullPtr<DisplayDevice> self, NonNullPtr<Window> window)
{ {
// TODO : save the instance in app state or something // TODO : save the instance in app state or something
HINSTANCE instance = GetModuleHandle(NULL); HINSTANCE instance = GetModuleHandle(nullptr);
// TODO : Put outside, we should not create a new class for each new window // TODO : Put outside, we should not create a new class for each new window
WNDCLASSEX WindowClass = {}; WNDCLASSEX WindowClass = {};
WindowClass.cbSize = sizeof(WNDCLASSEX); WindowClass.cbSize = sizeof(WNDCLASSEX);
WindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; WindowClass.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC;
WindowClass.lpfnWndProc = Win32MainWindowCallback; WindowClass.lpfnWndProc = Win32MainWindowCallback;
@@ -65,7 +65,7 @@ namespace Juliet::Win32
int x = CW_USEDEFAULT, y = CW_USEDEFAULT; int x = CW_USEDEFAULT, y = CW_USEDEFAULT;
const int w = window->Width, h = window->Height; const int w = window->Width, h = window->Height;
HWND handle = CreateWindowEx(styleEx, WindowClassPtr, L"JULIET TODO PASS TITLE", style, x, y, w, h, nullptr, HWND handle = CreateWindowEx(styleEx, WindowClassPtr, L"JULIET TODO PASS TITLE", style, x, y, w, h, nullptr,
nullptr, instance, nullptr); nullptr, instance, nullptr);
PumpEvents(self); PumpEvents(self);