AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(dyn-input): capture numpad 8/2 as digits, not history nav

Browse source 
NumLock açıkken Numpad8 / Numpad2 logical key olarak ArrowUp / ArrowDown
geliyor ama text "8" / "2" taşıyor. Klavye aboneliğinde ok/geçmiş
arm'ları bu tuşları yakaladığı için dinamik girişte 8 ve 2 yazılamıyordu.
Printable glyph üreten her tuş artık navigation arm'larından önce, text
alanı üzerinden yakalanıyor; whitespace/control üreten tuşlar (Space,
Enter, Tab) named handler'lara düşmeye devam ediyor. Gerçek ok tuşları
(text üretmez) geçmiş gezinmesini korur.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-05-27 17:36:06 +03:00
commit 6483566c5d
1 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/app/view.rs
View file

@ -782,6 +782,23 @@ impl OpenCADStudio {
}) => {
let ctrl = modifiers.control();
let shift = modifiers.shift();
// Any key that produces a printable glyph types it,
// even when its logical key resolves to navigation
// (NumLock-on Numpad8 / Numpad2 arrive as
// ArrowUp / ArrowDown but still carry text "8" /
// "2"). Checked before the Arrow / history arms so
// those numpad digits aren't swallowed as history
// navigation. Whitespace / control text (Space,
// Enter, Tab) falls through to the named handlers.
if !ctrl && status == Status::Ignored {
if let Some(t) = text.as_deref() {
if !t.is_empty()
&& t.chars().all(|c| !c.is_control() && !c.is_whitespace())
{
return Some(Message::CommandAppendChar(t.to_string()));
}
}
}
match key {
keyboard::Key::Named(keyboard::key::Named::Enter)
| keyboard::Key::Named(keyboard::key::Named::Space)
@ -847,20 +864,9 @@ impl OpenCADStudio {
"v" => Some(Message::Command("PASTECLIP".to_string())),
_ => None,
},
// Plain character keys (no ctrl) that nothing
// else consumed — route them into the command
// line input so typing always reaches it even
// when focus is parked on a button / viewport.
// Use the event's `text` (not the logical key)
// so numpad digits and other keypad glyphs —
// which don't arrive as `Key::Character` — are
// captured too.
_ if !ctrl && status == Status::Ignored => {
let glyph = text
.as_deref()
.filter(|t| !t.is_empty() && t.chars().all(|c| !c.is_control()));
glyph.map(|t| Message::CommandAppendChar(t.to_string()))
}
// Printable glyphs are already handled by the
// text guard above the match; anything reaching
// here is a non-typing key we don't bind.
_ => None,
}
}