Skip to content
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.

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

fix: focus hotkeys unreliable on W11 #749

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Changes from all commits
Commits
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
33 changes: 15 additions & 18 deletions packages/wm/src/common/platform/native_window.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,26 +280,23 @@ impl NativeWindow {
}

pub fn set_foreground(&self) -> anyhow::Result<()> {
// UIAccess allows for setting the foreground window without needing to
// send a key press event.
#[cfg(not(feature = "ui_access"))]
unsafe {
let input = INPUT {
r#type: INPUT_KEYBOARD,
Anonymous: INPUT_0 {
ki: KEYBDINPUT {
wVk: VIRTUAL_KEY(1),
wScan: 0,
dwFlags: KEYBD_EVENT_FLAGS(0),
time: 0,
dwExtraInfo: 0,
},
let input = INPUT {
r#type: INPUT_KEYBOARD,
Anonymous: INPUT_0 {
ki: KEYBDINPUT {
wVk: VIRTUAL_KEY(1),
wScan: 0,
dwFlags: KEYBD_EVENT_FLAGS(0),
time: 0,
dwExtraInfo: 0,
},
};
},
};

// Simulate a key press event to activate the window.
SendInput(&[input], std::mem::size_of::<INPUT>() as i32);
}
// Simulate a key press event to activate the window. VK code 1 is a
// left mouse button press and caused the least side effects versus
// other key codes.
unsafe { SendInput(&[input], std::mem::size_of::<INPUT>() as i32) };

// Set as the foreground window.
unsafe { SetForegroundWindow(HWND(self.handle)) }.ok()?;
Expand Down