lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-04 10:20:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

[KBSWITCH] Follow-up of #4815 (36f7d1a); Less flicker Alt+Shift

Browse Source 
Add bNoActivate argument to ActivateLayout function.
CORE-11700, CORE-2699, CORE-18546
This commit is contained in:
Katayama Hirofumi MZ
2022-10-29 16:23:58 +09:00
parent 8f9283398a
commit 433240feec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
base/applications/kbswitch/kbswitch.c
View File

@@ -401,7 +401,7 @@ EnumWindowsProc(HWND hwnd, LPARAM lParam)
}
static VOID
ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL)
ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoActivate)
{
HKL hKl;
TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH];
@@ -419,7 +419,7 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL)
GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName));
UpdateTrayIcon(hwnd, szLCID, szLangName);
if (hwndTarget)
if (hwndTarget && !bNoActivate)
SetForegroundWindow(hwndTarget);
hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE);
@@ -671,7 +671,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
AddTrayIcon(hwnd);
ActivateLayout(hwnd, ulCurrentLayoutNum, NULL);
ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, FALSE);
s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
break;
}
@@ -775,13 +775,13 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
ulCurrentLayoutNum = uNum;
}
ActivateLayout(hwnd, GetNextLayout(), hwndTarget);
ActivateLayout(hwnd, GetNextLayout(), hwndTarget, TRUE);
/* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and
DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */
if (bCONWND)
{
ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave);
ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave, TRUE);
}
break;
}
@@ -794,7 +794,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
g_hwndLastActive = NULL;
}
ActivateLayout(hwnd, LOWORD(wParam), g_hwndLastActive);
ActivateLayout(hwnd, LOWORD(wParam), g_hwndLastActive, FALSE);
}
break;
}