mirrors/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-22 10:32:54 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #101697 from bruvzg/win_dlg_ncc

Browse source 
[Windows] Make native dialogs non-cancelable and stay on top of parent.
This commit is contained in:
Thaddeus Crews 2025-01-20 10:05:42 -06:00
commit edaf14aada
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
platform/windows/display_server_windows.cpp
View file

@ -3051,8 +3051,14 @@ Error DisplayServerWindows::dialog_show(String p_title, String p_description, Ve
buttons.push_back(s.utf16()); buttons.push_back(s.utf16());
} }
WindowID window_id = _get_focused_window_or_popup();
if (!windows.has(window_id)) {
window_id = MAIN_WINDOW_ID;
}
config.pszWindowTitle = (LPCWSTR)(title.get_data()); config.pszWindowTitle = (LPCWSTR)(title.get_data());
config.pszContent = (LPCWSTR)(message.get_data()); config.pszContent = (LPCWSTR)(message.get_data());
config.hwndParent = windows[window_id].hWnd;
const int button_count = buttons.size(); const int button_count = buttons.size();
config.cButtons = button_count; config.cButtons = button_count;
@ -3061,7 +3067,7 @@ Error DisplayServerWindows::dialog_show(String p_title, String p_description, Ve
TASKDIALOG_BUTTON *tbuttons = button_count != 0 ? (TASKDIALOG_BUTTON *)alloca(sizeof(TASKDIALOG_BUTTON) * button_count) : nullptr; TASKDIALOG_BUTTON *tbuttons = button_count != 0 ? (TASKDIALOG_BUTTON *)alloca(sizeof(TASKDIALOG_BUTTON) * button_count) : nullptr;
if (tbuttons) { if (tbuttons) {
for (int i = 0; i < button_count; i++) { for (int i = 0; i < button_count; i++) {
tbuttons[i].nButtonID = i; tbuttons[i].nButtonID = i + 100;
tbuttons[i].pszButtonText = (LPCWSTR)(buttons[i].get_data()); tbuttons[i].pszButtonText = (LPCWSTR)(buttons[i].get_data());
} }
} }
@ -3078,7 +3084,7 @@ Error DisplayServerWindows::dialog_show(String p_title, String p_description, Ve
if (task_dialog_indirect && SUCCEEDED(task_dialog_indirect(&config, &button_pressed, nullptr, nullptr))) { if (task_dialog_indirect && SUCCEEDED(task_dialog_indirect(&config, &button_pressed, nullptr, nullptr))) {
if (p_callback.is_valid()) { if (p_callback.is_valid()) {
Variant button = button_pressed; Variant button = button_pressed - 100;
const Variant *args[1] = { &button }; const Variant *args[1] = { &button };
Variant ret; Variant ret;
Callable::CallError ce; Callable::CallError ce;
@ -3228,7 +3234,7 @@ Error DisplayServerWindows::dialog_input_text(String p_title, String p_descripti
WCHAR font[13]; // must be "MS Shell Dlg" WCHAR font[13]; // must be "MS Shell Dlg"
} template_base = { } template_base = {
1, 0xFFFF, 0, 0, 1, 0xFFFF, 0, 0,
DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU, DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION,
3, 0, 0, 20, 20, L"", L"#32770", L"", 8, FW_NORMAL, 0, DEFAULT_CHARSET, L"MS Shell Dlg" 3, 0, 0, 20, 20, L"", L"#32770", L"", 8, FW_NORMAL, 0, DEFAULT_CHARSET, L"MS Shell Dlg"
}; };