From 922f7a5b5f124e893f3d508a2a5994b0ad9ac9cd Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 11:07:12 -0800 Subject: [PATCH] Properties: the Graph section hides series buttons for an empty graph and keeps long labels whole MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Column… and Marker… count a graph's series as graph.column and graph.marker do, so a graph whose data was cleared shows neither. When a translated Graph Type… or Graph Data… label does not fit in half of the panel, each button of the pair takes a row of its own at full width instead of clipping its label. --- crates/ui-egui/src/panels/properties/graph.rs | 21 +++++++-- crates/ui-egui/src/panels/properties/tests.rs | 47 +++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/panels/properties/graph.rs b/crates/ui-egui/src/panels/properties/graph.rs index fe86d6e0ac..525b65f722 100644 --- a/crates/ui-egui/src/panels/properties/graph.rs +++ b/crates/ui-egui/src/panels/properties/graph.rs @@ -36,7 +36,7 @@ pub(crate) fn shown(app: &VectorcraftApp) -> Option { } let graph = graph?; let spec = doc.node(graph)?.extras().graph.as_deref()?; - let count = spec.rows.iter().map(Vec::len).max().unwrap_or(0).clamp(1, MAX_GRAPH_SERIES); + let count = spec.rows.iter().map(Vec::len).max().unwrap_or(0).min(MAX_GRAPH_SERIES); // The series Column… and Marker… change: those picked with Group Selection when the selection is // only series, else every series (as `graph.column` and `graph.marker` pick them). let picked: Option> = st.selection.objects.iter().map(|id| series_of(doc, graph, *id).filter(|i| *i < count)).collect(); @@ -85,15 +85,26 @@ pub(crate) fn section(app: &mut VectorcraftApp, ui: &mut Ui) { if s.marker { buttons.push((tl!("Marker…"), "graph.marker")); } - let w = (ui.available_width() - 6.0) / 2.0; + let full = ui.available_width(); + let w = (full - 6.0) / 2.0; for pair in buttons.chunks(2) { - ui.horizontal(|ui| { + // Two buttons share a row while both labels fit in half of it; a longer translated label + // puts each button of the pair on a row of its own. + if pair.iter().all(|(label, _)| widgets::flat_button_fit_width(ui, label, 0.0) <= w) { + ui.horizontal(|ui| { + for (label, id) in pair { + if widgets::flat_button(ui, label, w).clicked() { + crate::menus::invoke(app, id, json!({})); + } + } + }); + } else { for (label, id) in pair { - if widgets::flat_button(ui, label, w).clicked() { + if widgets::flat_button_fit(ui, label, full).clicked() { crate::menus::invoke(app, id, json!({})); } } - }); + } } divider(ui); } diff --git a/crates/ui-egui/src/panels/properties/tests.rs b/crates/ui-egui/src/panels/properties/tests.rs index 7411216276..dff640f2e2 100644 --- a/crates/ui-egui/src/panels/properties/tests.rs +++ b/crates/ui-egui/src/panels/properties/tests.rs @@ -2066,6 +2066,45 @@ fn one_selected_graph_has_a_graph_section_whose_buttons_open_the_graph_dialogs() assert_eq!(press(&mut app, "Column…").kind, crate::dialogs::graph_design::COLUMN); } +/// At the panel's narrowest, Graph Type… and Graph Data… share a row in English, and a translated +/// label too long for half of the row puts each of them on a row of its own, drawn whole. +#[test] +fn the_graph_sections_long_labels_get_rows_of_their_own() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + graph_doc(&mut app, "column", 0.0); + let ctx = egui::Context::default(); + let width = 220.0; + let texts = |app: &mut VectorcraftApp| { + let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(width, 700.0))), ..Default::default() }; + let mut out = ctx.run_ui(raw, |ui| graph::section(app, ui)); + out.textures_delta.clear(); + out.shapes + .iter() + .filter_map(|s| { + if let egui::Shape::Text(t) = &s.shape { + Some((t.galley.text().to_string(), Rect::from_min_size(t.pos, t.galley.size()))) + } else { + None + } + }) + .collect::>() + }; + let rect = |texts: &[(String, Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| *r).unwrap_or_else(|| panic!("no {label:?} in {texts:?}")) + }; + crate::i18n::set_current(crate::i18n::Lang::EN); + let english = texts(&mut app); + assert_eq!(rect(&english, "Graph Type…").center().y, rect(&english, "Graph Data…").center().y, "{english:?}"); + crate::i18n::set_current(crate::i18n::Lang::from_code("de").expect("de registered")); + let german = texts(&mut app); + crate::i18n::set_current(crate::i18n::Lang::EN); + let (kind, data) = (rect(&german, "Diagrammtyp…"), rect(&german, "Diagrammdaten…")); + assert!(kind.bottom() <= data.top(), "{german:?}"); + for r in [kind, data] { + assert!(r.left() >= 0.0 && r.right() <= width, "{r:?} in {german:?}"); + } +} + /// Column… shows when every series it would change draws columns or bars, Marker… when every one /// draws lines, scatter points or radar lines: series picked with Group Selection count on their /// own, and a combined graph selected whole shows neither. @@ -2097,6 +2136,14 @@ fn the_graph_sections_column_and_marker_follow_the_series_they_would_change() { assert_eq!(graph::shown(&app).map(|s| (s.column, s.marker)), Some(shown), "{kind}"); app.run("edit.clear", json!({})).unwrap(); } + // A graph whose data was cleared has no series for Column… or Marker… to change. + for kind in ["column", "line"] { + let id = graph_doc(&mut app, kind, 300.0); + app.run("graph.setData", json!({"id": id, "series": [], "categories": [], "rows": []})).unwrap(); + app.run("select.set", json!({"ids": [id]})).unwrap(); + assert_eq!(graph::shown(&app), Some(graph::Shown { column: false, marker: false }), "an empty {kind} graph"); + app.run("edit.clear", json!({})).unwrap(); + } } /// The Graph section shows only while everything selected is one graph or lies in it.