godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix NativeMenu layout direction on macOS, add extra check for Windows menu.

Browse Source
This commit is contained in:
bruvzg
2024-03-15 09:18:48 +02:00
parent 0175be8948
commit 3459aaa9d1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/windows/native_menu_windows.cpp
View File

@@ -289,7 +289,7 @@ int NativeMenuWindows::add_item(const RID &p_rid, const String &p_label, const C
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
item.fType = MFT_STRING;
item.dwItemData = (ULONG_PTR)item_data;
item.dwTypeData = (LPWSTR)label.ptrw();
item.dwTypeData = label.ptrw() ? (LPWSTR)label.ptrw() : L"";
if (!InsertMenuItemW(md->menu, p_index, true, &item)) {
memdelete(item_data);
@@ -949,7 +949,7 @@ void NativeMenuWindows::set_item_text(const RID &p_rid, int p_idx, const String
item.cbSize = sizeof(item);
item.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_DATA;
if (GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
item.dwTypeData = (LPWSTR)label.ptrw();
item.dwTypeData = label.ptrw() ? (LPWSTR)label.ptrw() : L"";
SetMenuItemInfoW(md->menu, p_idx, true, &item);
}
}