godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #77977 from zaevi/fix_windows_popup_ime 

Fix IME doesn't work under Popup on Windows.
This commit is contained in:
Rémi Verschelde 2023-06-09 11:06:02 +02:00
parent 9b31d257ae 1b149b7440
commit 759309ba18
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform/windows/display_server_windows.cpp
View File

@ -835,9 +835,12 @@ void DisplayServerWindows::show_window(WindowID p_id) {
SetFocus(wd.hWnd); // Set keyboard focus.
} else if (wd.minimized) {
ShowWindow(wd.hWnd, SW_SHOWMINIMIZED);
} else if (wd.no_focus || wd.is_popup) {
} else if (wd.no_focus) {
// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-showwindow
ShowWindow(wd.hWnd, SW_SHOWNA);
} else if (wd.is_popup) {
ShowWindow(wd.hWnd, SW_SHOWNA);
SetFocus(wd.hWnd); // Set keyboard focus.
} else {
ShowWindow(wd.hWnd, SW_SHOW);
SetForegroundWindow(wd.hWnd); // Slightly higher priority.