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.

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

Jump to bottom

Added support for 20 fn keys #1665

Merged
merged 3 commits into from May 23, 2022
Merged

Added support for 20 fn keys #1665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49902d2
Added support for 20 fn keys
May 22, 2022
058dc95
Add some spacing
emilk May 23, 2022
ea8ed3d
cargo fmt
emilk May 23, 2022
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
21 changes: 21 additions & 0 deletions eframe/src/web/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,27 @@ pub fn translate_key(key: &str) -> Option<egui::Key> {
"y" | "Y" => Some(egui::Key::Y),
"z" | "Z" => Some(egui::Key::Z),

"F1" => Some(egui::Key::F1),
"F2" => Some(egui::Key::F2),
"F3" => Some(egui::Key::F3),
"F4" => Some(egui::Key::F4),
"F5" => Some(egui::Key::F5),
"F6" => Some(egui::Key::F6),
"F7" => Some(egui::Key::F7),
"F8" => Some(egui::Key::F8),
"F9" => Some(egui::Key::F9),
"F10" => Some(egui::Key::F10),
"F11" => Some(egui::Key::F11),
"F12" => Some(egui::Key::F12),
"F13" => Some(egui::Key::F13),
"F14" => Some(egui::Key::F14),
"F15" => Some(egui::Key::F15),
"F16" => Some(egui::Key::F16),
"F17" => Some(egui::Key::F17),
"F18" => Some(egui::Key::F18),
"F19" => Some(egui::Key::F19),
"F20" => Some(egui::Key::F20),

_ => None,
}
}
Expand Down
21 changes: 21 additions & 0 deletions egui-winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,27 @@ fn translate_virtual_key_code(key: winit::event::VirtualKeyCode) -> Option<egui:
VirtualKeyCode::Y => Key::Y,
VirtualKeyCode::Z => Key::Z,

VirtualKeyCode::F1 => Key::F1,
VirtualKeyCode::F2 => Key::F2,
VirtualKeyCode::F3 => Key::F3,
VirtualKeyCode::F4 => Key::F4,
VirtualKeyCode::F5 => Key::F5,
VirtualKeyCode::F6 => Key::F6,
VirtualKeyCode::F7 => Key::F7,
VirtualKeyCode::F8 => Key::F8,
VirtualKeyCode::F9 => Key::F9,
VirtualKeyCode::F10 => Key::F10,
VirtualKeyCode::F11 => Key::F11,
VirtualKeyCode::F12 => Key::F12,
VirtualKeyCode::F13 => Key::F13,
VirtualKeyCode::F14 => Key::F14,
VirtualKeyCode::F15 => Key::F15,
VirtualKeyCode::F16 => Key::F16,
VirtualKeyCode::F17 => Key::F17,
VirtualKeyCode::F18 => Key::F18,
VirtualKeyCode::F19 => Key::F19,
VirtualKeyCode::F20 => Key::F20,

_ => {
return None;
}
Expand Down
22 changes: 22 additions & 0 deletions egui/src/data/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,28 @@ pub enum Key {
X,
Y,
Z, // Used for cmd+Z (undo)

// The function keys:
F1,
F2,
F3,
F4,
F5,
F6,
F7,
F8,
F9,
F10,
F11,
F12,
F13,
F14,
F15,
F16,
F17,
F18,
F19,
F20,
}

impl RawInput {
Expand Down