1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00

Merge branch 'main' into ime-preedit-visuals

# Conflicts:
#	crates/egui/src/data/input.rs
This commit is contained in:
umajho
2026-06-10 19:01:02 +08:00
45 changed files with 1969 additions and 1459 deletions

View File

@@ -1600,6 +1600,22 @@ fn key_from_key_code(key: winit::keyboard::KeyCode) -> Option<egui::Key> {
KeyCode::F34 => Key::F34,
KeyCode::F35 => Key::F35,
// Modifier keys — egui now surfaces them as distinct physical
// variants so games / capture UIs can bind them independently.
// The collapsed `Modifiers.shift/ctrl/alt/command` booleans still
// track just the "any side is pressed" state for shortcut matching.
KeyCode::ShiftLeft => Key::ShiftLeft,
KeyCode::ShiftRight => Key::ShiftRight,
KeyCode::ControlLeft => Key::ControlLeft,
KeyCode::ControlRight => Key::ControlRight,
KeyCode::AltLeft => Key::AltLeft,
KeyCode::AltRight => Key::AltRight,
KeyCode::SuperLeft => Key::SuperLeft,
KeyCode::SuperRight => Key::SuperRight,
// ISO 102nd key — `<>|` on French AZERTY, `\|` on UK QWERTY.
KeyCode::IntlBackslash => Key::IntlBackslash,
_ => {
return None;
}