Sara/api_tester
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: updated godot version

Browse source
This commit is contained in:
Sara Gerretsen 2026-04-04 19:38:56 +02:00
parent 0c508b0831
commit 42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
Download patch file Download diff file Expand all files Collapse all files

54
engine/platform/windows/native_menu_windows.cpp
View file

@ -170,7 +170,7 @@ void NativeMenuWindows::popup(const RID &p_rid, const Vector2i &p_position) {
const MenuData *md = menus.get_or_null(p_rid);
ERR_FAIL_NULL(md);
HWND hwnd = (HWND)DisplayServer::get_singleton()->window_get_native_handle(DisplayServerEnums::WINDOW_HANDLE, DisplayServerEnums::MAIN_WINDOW_ID);
HWND hwnd = (HWND)DisplayServer::get_singleton()->window_get_native_handle(DisplayServer::WINDOW_HANDLE, DisplayServer::MAIN_WINDOW_ID);
UINT flags = TPM_HORIZONTAL | TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON | TPM_VERPOSANIMATION;
if (md->is_rtl) {
flags |= TPM_LAYOUTRTL;
@ -1122,58 +1122,6 @@ void NativeMenuWindows::set_item_indentation_level(const RID &p_rid, int p_idx,
// Not supported.
}
int NativeMenuWindows::set_item_index(const RID &p_rid, int p_idx, int p_target_idx) {
ERR_FAIL_COND_V(p_idx < 0, -1);
const MenuData *md = menus.get_or_null(p_rid);
ERR_FAIL_NULL_V(md, -1);
int count = GetMenuItemCount(md->menu);
ERR_FAIL_COND_V(p_idx >= count, -1);
ERR_FAIL_INDEX_V(p_target_idx, count, -1);
// Get item text separately.
MENUITEMINFOW item;
ZeroMemory(&item, sizeof(item));
item.cbSize = sizeof(item);
item.fMask = MIIM_STRING;
item.dwTypeData = nullptr;
Char16String str;
if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
return -1;
}
item.cch++;
str.resize_uninitialized(item.cch);
item.dwTypeData = (LPWSTR)str.ptrw();
if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
return -1;
}
ZeroMemory(&item, sizeof(item));
item.cbSize = sizeof(item);
item.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_STRING | MIIM_STATE | MIIM_SUBMENU | MIIM_BITMAP;
if (!GetMenuItemInfoW(md->menu, p_idx, true, &item)) {
return -1;
}
item.dwTypeData = (LPWSTR)str.get_data();
if (!RemoveMenu(md->menu, p_idx, MF_BYPOSITION)) {
return -1;
}
if (!InsertMenuItemW(md->menu, p_target_idx, true, &item)) {
// Delete item if failed to insert.
MenuItemData *item_data = (MenuItemData *)item.dwItemData;
if (item_data) {
if (item_data->bmp) {
DeleteObject(item_data->bmp);
}
memdelete(item_data);
}
return -1;
}
return p_target_idx;
}
int NativeMenuWindows::get_item_count(const RID &p_rid) const {
const MenuData *md = menus.get_or_null(p_rid);
ERR_FAIL_NULL_V(md, 0);