Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge #142: Control bar row is horizontal_top, so the second row of two-row groups shows

aiongg7ff03ade344b
diff --cc crates/ui-egui/src/lib.rs
index 03dc47ba2,6f65a6aa6..ef19ff5e3
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -889,21 -872,30 +889,45 @@@ pub fn drop_key_name_text(raw: &mut egu
mod tests {
use super::*;
+ /// The Control panel's two-row groups were centred as if they were one row tall, so the second
+ /// row hung below the panel and was cut off.
+ #[test]
+ fn control_bar_shows_its_second_row() {
+ use egui_kittest::kittest::Queryable as _;
+ let mut app = DesignApp::new(designcraft_engine::Session::new(), Services::default());
+ app.run("file.newSample", json!({})).unwrap();
+ app.ui.control_bar = true;
+ let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1440.0, 900.0)).build_ui_state(
+ |ui, app: &mut DesignApp| {
+ let ctx = ui.ctx().clone();
+ app.logic(&ctx);
+ app.ui(ui);
+ },
+ app,
+ );
+ h.run_steps(4);
+ let bar = egui::containers::panel::PanelState::load(&h.ctx, egui::Id::new("control_bar")).unwrap().outer_rect;
+ assert!(bar.height() > 40.0, "{bar:?}");
+ let rows: Vec<egui::Rect> = h.query_all_by_label("Y:").map(|n| n.rect()).filter(|r| bar.contains(r.left_top())).collect();
+ assert_eq!(rows.len(), 1, "the Y: caption of the Control panel");
+ assert!(rows[0].bottom() <= bar.bottom(), "Y: caption {:?} hangs below the Control panel {bar:?}", rows[0]);
+ }
+
+ #[test]
+ fn key_names_sent_as_text_are_dropped() {
+ let text = |t: &str| egui::Event::Text(t.to_string());
+ let events = || {
+ vec![text("AltGraph"), text("é"), text("Dead"), text("A"), text("Unidentified"), text("ß"), text("AudioVolumeUp"), text("ab"), text("Æ")]
+ };
+ let mut raw = egui::RawInput { events: events(), ..Default::default() };
+ drop_key_name_text(&mut raw, false);
+ assert_eq!(raw.events, vec![text("é"), text("A"), text("ß"), text("ab"), text("Æ")]);
+ // A focused text field gets its text from input events, which can be whole words.
+ let mut raw = egui::RawInput { events: events(), ..Default::default() };
+ drop_key_name_text(&mut raw, true);
+ assert_eq!(raw.events, events());
+ }
+
#[test]
fn snap_view_uses_the_saved_switches() {
let mut ui = UiState::default();