shifathosn
/
gridcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix combo navigation edge cases and wire Page Layout Sheet Options badges 

- Arrows/Enter while a keytip combo is open now navigate the list instead
  of moving the filter field's text cursor (events stripped from TextEdit)
- Reopening a combo resets the filter: the reset frame requests a repaint
  so the stale filtered list never lingers on screen
- Page Layout Sheet Options: Gridlines View/Print and Headings View/Print
  checkboxes painted with VG/PG/VH/PH badges and keytip toggles
- Background rebound from PG to PGB (Excel's Page Setup GB badge); PG is
  no longer terminal
This commit is contained in:
James 2026-10-11 22:16:14 +03:00
parent 7ba871c6f2
commit d2a691aea8
5 changed files with 2739 additions and 2692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ui-egui/src/keytips/keytip_table/generated.rs
View File

@ -208,7 +208,7 @@ pub const SEQUENCES: &[(&str, Entry)] = &[
("PB", Entry::Continue), // Excel: Breaks; group level:
("PBI", Entry::Finish(Action::Command("pageLayout.breaks"))), // Excel: Insert Page Break; Insert Page Break
("PBR", Entry::Finish(Action::Command("pageLayout.breaks"))), // Excel: Remove Page Break; Remove Page Break
("PG", Entry::Finish(Action::Command("pageLayout.background"))), // Excel: Background
("PGB", Entry::Finish(Action::Command("pageLayout.background"))), // Excel: Background; Excel badge GB (Background in the Page Setup group)
("PI", Entry::Finish(Action::Command("pageLayout.printTitles"))), // Excel: Print Titles
("PM", Entry::Continue), // Excel: Margins; group level:
("PMA", Entry::Finish(Action::Command("pageLayout.margins"))), // Excel: Custom Margins; containment(Margins)

5320
crates/ui-egui/src/keytips/keytips.json
View File

File diff suppressed because it is too large Load Diff

80
crates/ui-egui/src/ribbon.rs
View File

@ -393,10 +393,28 @@ fn editable_combo(
if open_now && !st.was_open {
st.text = String::new();
st.sel = items.iter().position(|(v, _)| *v == current_value).map(|i| i as i32).unwrap_or(0);
// The reset lands on the frame AFTER the popup opens, which usually has no input of
// its own — without a repaint request the stale filtered list stays on screen.
ui.ctx().request_repaint();
}
st.was_open = open_now;
let mut result = ComboResult::None;
egui::Popup::menu(anchor).open_memory(popup_command(forced, anchor.clicked())).show(|ui| {
// Arrows and Enter navigate the list, not the filter field's cursor. Capture them and
// strip them from the input so the TextEdit never sees them.
let (mut down, mut up, mut enter) = (false, false, false);
ui.input(|i| {
down = i.key_pressed(egui::Key::ArrowDown);
up = i.key_pressed(egui::Key::ArrowUp);
enter = i.key_pressed(egui::Key::Enter);
});
if down || up || enter {
ui.ctx().input_mut(|i| {
i.events.retain(|e| {
!matches!(e, egui::Event::Key { key: egui::Key::ArrowDown | egui::Key::ArrowUp | egui::Key::Enter, pressed: true, .. })
});
});
}
let text_id = anchor.id.with(salt).with("__combo_text");
let te = ui.add(egui::TextEdit::singleline(&mut st.text).id(text_id).desired_width(220.0).hint_text("Type to filter…"));
if open_now && !te.has_focus() {
@ -410,28 +428,26 @@ fn editable_combo(
}
let lower = st.text.to_lowercase();
let filtered: Vec<usize> = items.iter().enumerate().filter(|(_, (_, d))| d.to_lowercase().contains(&lower)).map(|(i, _)| i).collect();
ui.input(|i| {
if !filtered.is_empty() {
let n = filtered.len() as i32;
if i.key_pressed(egui::Key::ArrowDown) {
st.sel = (st.sel + 1).rem_euclid(n);
}
if i.key_pressed(egui::Key::ArrowUp) {
st.sel = (st.sel - 1).rem_euclid(n);
}
if !filtered.is_empty() {
let n = filtered.len() as i32;
if down {
st.sel = (st.sel + 1).rem_euclid(n);
}
if i.key_pressed(egui::Key::Enter) {
if filtered.is_empty() {
let t = st.text.trim().to_string();
if !t.is_empty() {
result = ComboResult::Entered(t);
}
} else {
let idx = filtered[st.sel.clamp(0, filtered.len() as i32 - 1) as usize];
result = ComboResult::Picked(items[idx].0.to_string());
}
if up {
st.sel = (st.sel - 1).rem_euclid(n);
}
});
}
if enter {
if filtered.is_empty() {
let t = st.text.trim().to_string();
if !t.is_empty() {
result = ComboResult::Entered(t);
}
} else {
let idx = filtered[st.sel.clamp(0, filtered.len() as i32 - 1) as usize];
result = ComboResult::Picked(items[idx].0.to_string());
}
}
ui.separator();
egui::ScrollArea::vertical().max_height(240.0).show(ui, |ui| {
for i in &filtered {
@ -1679,23 +1695,31 @@ fn page_layout(app: &mut SheetApp, ui: &mut Ui) {
ui.vertical(|ui| {
ui.label(egui::RichText::new(app.ui.language.tr("Gridlines")).strong().small());
let mut v = sh.0;
if ui.checkbox(&mut v, screen).changed() {
act(app, "view.gridlines", json!({"on": v}));
let resp = ui.checkbox(&mut v, screen);
control_keytip(app, ui, &resp, "view.gridlines");
if resp.changed() || invoke(app, "view.gridlines") {
act(app, "view.gridlines", json!({"on": !v}));
}
let mut p = sh.2;
if ui.checkbox(&mut p, print).changed() {
act(app, "pageLayout.printGridlines", json!({"on": p}));
let resp = ui.checkbox(&mut p, print);
control_keytip(app, ui, &resp, "pageLayout.printGridlines");
if resp.changed() || invoke(app, "pageLayout.printGridlines") {
act(app, "pageLayout.printGridlines", json!({"on": !p}));
}
});
ui.vertical(|ui| {
ui.label(egui::RichText::new(app.ui.language.tr("Headings")).strong().small());
let mut v = sh.1;
if ui.checkbox(&mut v, screen).changed() {
act(app, "view.headings", json!({"on": v}));
let resp = ui.checkbox(&mut v, screen);
control_keytip(app, ui, &resp, "view.headings");
if resp.changed() || invoke(app, "view.headings") {
act(app, "view.headings", json!({"on": !v}));
}
let mut p = sh.3;
if ui.checkbox(&mut p, print).changed() {
act(app, "pageLayout.printHeadings", json!({"on": p}));
let resp = ui.checkbox(&mut p, print);
control_keytip(app, ui, &resp, "pageLayout.printHeadings");
if resp.changed() || invoke(app, "pageLayout.printHeadings") {
act(app, "pageLayout.printHeadings", json!({"on": !p}));
}
});
let rtl = app.session.active().and_then(|d| d.wb.active()).is_some_and(|s| s.right_to_left);

23
crates/ui-egui/tests/keytips.rs
View File

@ -495,6 +495,29 @@ fn editable_combos_filter_by_typing_and_move_by_arrows() {
h.run_steps(3);
assert!(h.state().message.is_none() && h.state().toast.is_none(), "custom sizes must apply");
assert_eq!(h.query_all_by_label("13.5").count(), 1, "the button must show the custom size");
// Closing without applying (Escape) and reopening must reset the filter to the full list.
let mut h = harness(blank());
sequence(&mut h, &[Key::H, Key::F, Key::F], false);
h.run_steps(3);
events(&mut h, [Event::Text("arial".into())]);
h.run_steps(3);
key(&mut h, Key::Escape);
h.run_steps(3);
sequence(&mut h, &[Key::H, Key::F, Key::F], false);
h.run_steps(4);
assert!(h.query_all_by_label("Georgia").count() >= 1, "reopening must show the full, unfiltered list");
// Arrows after typing move the highlight, not the text cursor: type a filter,
// then Down twice and Enter must apply the second match's neighbour logic.
key(&mut h, Key::Escape);
h.run_steps(3);
sequence(&mut h, &[Key::H, Key::F, Key::F], false);
h.run_steps(3);
events(&mut h, [Event::Text("candara".into())]);
h.run_steps(3);
key(&mut h, Key::Enter);
h.run_steps(3);
assert_eq!(h.query_all_by_label("Candara").count(), 1, "filtered Enter must apply the filtered row");
}
#[test]

6
crates/ui-egui/tests/keytips_generated.rs
View File

@ -1534,10 +1534,10 @@ fn keytip_pbr_() {
}
#[test]
fn keytip_pg_() {
fn keytip_pgb_() {
let mut h = harness(blank());
sequence(&mut h, "PG", false);
assert!(h.state().session.journal.iter().any(|(id, _)| id == "pageLayout.background"), "PG must journal pageLayout.background");
sequence(&mut h, "PGB", false);
assert!(h.state().session.journal.iter().any(|(id, _)| id == "pageLayout.background"), "PGB must journal pageLayout.background");
}
#[test]