Skip to content

fix bug on recognizing Shift+Key press/release #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PavelAmialiushka wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix bug on recognizing Shift+Key press/release #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions KeyboardHook.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,19 @@ private bool ProcessKeyPressInt(int nCode, IntPtr wParam, IntPtr lParam)
var keybdinput = (KEYBDINPUT)Marshal.PtrToStructure(lParam, typeof(KEYBDINPUT));
var keyData = (Keys)keybdinput.Vk;

keyData |= LowLevelAdapter.KeyPressed(Keys.ControlKey) ? Keys.Control : 0;
keyData |= LowLevelAdapter.KeyPressed(Keys.Menu) ? Keys.Alt : 0;
keyData |= LowLevelAdapter.KeyPressed(Keys.ShiftKey) ? Keys.Shift : 0;
bool modifiers =
(Keys)keybdinput.Vk == Keys.RControlKey
|| (Keys)keybdinput.Vk == Keys.LControlKey
|| (Keys)keybdinput.Vk == Keys.RShiftKey
|| (Keys)keybdinput.Vk == Keys.LShiftKey
|| (Keys)keybdinput.Vk == Keys.Alt;

if (!modifiers)
{
keyData |= LowLevelAdapter.KeyPressed(Keys.ControlKey) ? Keys.Control : 0;
keyData |= LowLevelAdapter.KeyPressed(Keys.Menu) ? Keys.Alt : 0;
keyData |= LowLevelAdapter.KeyPressed(Keys.ShiftKey) ? Keys.Shift : 0;
}
var winPressed = LowLevelAdapter.KeyPressed(Keys.LWin) || LowLevelAdapter.KeyPressed(Keys.RWin);

var args = new KeyboardEventArgs(keyData, winPressed, key_down);
Expand Down
1 change: 1 addition & 0 deletions SettingsForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ void InitializeHotkeyBoxes()
}
void kbdHook_KeyboardEvent(object sender, KeyboardEventArgs e)
{
if (!e.Pressed) return;
if (currentHotkeyType != HotKeyType.None)
{
var vk = e.KeyCode;
Expand Down
4 changes: 1 addition & 3 deletions Switcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,12 @@ private void OnKeyPress(KeyboardEventArgs evtData)
{
var vkCode = evtData.KeyCode;

readyToSwitch = false;
if (evtData.Equals(settings.SwitchLayoutHotkey))
{
readyToSwitch = true;
return;
}

readyToSwitch = false;

if (evtData.Equals(settings.SwitchHotkey))
{
ConvertLast();
Expand Down