From e917cc2cc6acb87756e16f07b0fc6d315780caa0 Mon Sep 17 00:00:00 2001 From: bflatastic Date: Mon, 9 Nov 2026 18:24:27 +0700 Subject: [PATCH] Fit the landed changes together --- crates/forms/src/values.rs | 4 +++- crates/ui-egui/src/canvas/sign_tab_tests.rs | 2 ++ crates/ui-egui/tests/it/comments.rs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/crates/forms/src/values.rs b/crates/forms/src/values.rs index 1295d96db4..b4fa382189 100644 --- a/crates/forms/src/values.rs +++ b/crates/forms/src/values.rs @@ -350,7 +350,9 @@ pub(crate) fn write_value(doc: &mut Document, f: &Field, value: &FieldValue, scr } } FieldValue::Radio(None) => None, - FieldValue::Choice(_) | FieldValue::ChoiceIndices(_) | FieldValue::Widget(_) => return invalid(format!("{:?} is a check box: use true or false", f.name)), + FieldValue::Choice(_) | FieldValue::ChoiceIndices(_) | FieldValue::Widget(_) => { + return invalid(format!("{:?} is a check box: use true or false", f.name)); + } }; set_states(doc, f, state.as_deref(), None) } diff --git a/crates/ui-egui/src/canvas/sign_tab_tests.rs b/crates/ui-egui/src/canvas/sign_tab_tests.rs index f402fd93d7..60a57f8137 100644 --- a/crates/ui-egui/src/canvas/sign_tab_tests.rs +++ b/crates/ui-egui/src/canvas/sign_tab_tests.rs @@ -51,6 +51,8 @@ fn field(name: &str, page: usize, rect: [f64; 4]) -> FormField { flags: 0, max_len: None, options: Vec::new(), + selected: Vec::new(), + single_value_is_array: false, da: String::new(), quadding: 0, tooltip: None, diff --git a/crates/ui-egui/tests/it/comments.rs b/crates/ui-egui/tests/it/comments.rs index f1e185c273..502c1cc34e 100644 --- a/crates/ui-egui/tests/it/comments.rs +++ b/crates/ui-egui/tests/it/comments.rs @@ -3570,7 +3570,7 @@ fn the_selection_bar_stays_inside_the_pages_area() { h.run_steps(4); let viewport = h.state().views[0].viewport_rect(); // The bar's whole area, frame included, not only its first and last buttons. - let id = egui::Id::unique(("text-selection-actions", h.state().views[0].id.0)); + let id = egui::Id::unique(("text-selection-actions", h.state().views[0].view_key())); let bar = h.ctx.memory(|m| m.area_rect(id)).expect("the selection bar is shown"); // The bar opens at the selection's left edge: past the area's right edge, without the clamp. let anchor = h.state().views[0].glyph_screen_rect(0, last).unwrap().left();