From a6739ff0a92411fe5444bd02ab2b42215499d1e6 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Thu, 5 Nov 2026 07:39:48 +0100 Subject: [PATCH] Hide unnecessary export confirmation scrollbars --- crates/rundown-converter/src/gui.rs | 16 ++++++++++++---- docs/rundown-converter.md | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/crates/rundown-converter/src/gui.rs b/crates/rundown-converter/src/gui.rs index f2f0bd2..7e19666 100644 --- a/crates/rundown-converter/src/gui.rs +++ b/crates/rundown-converter/src/gui.rs @@ -926,8 +926,8 @@ impl App { Tab::Results => { if let Some(p) = &self.completed { ui.heading("Export ready"); - ui.label(p.display().to_string()); - ui.horizontal(|ui| { + ui.add(egui::Label::new(p.display().to_string()).wrap()); + ui.horizontal_wrapped(|ui| { if ui.button("Open").clicked() && let Err(e) = open::that(p) { @@ -943,11 +943,11 @@ impl App { ui.ctx().copy_text(p.display().to_string()); } }); - ui.label(if p.extension().and_then(|extension| extension.to_str()) == Some("xlsx") { + ui.add(egui::Label::new(if p.extension().and_then(|extension| extension.to_str()) == Some("xlsx") { "Import the .xlsx file with Ontime's spreadsheet importer and map the displayed columns. Review the schedule before running the show." } else { "Import the .ontime.json project in Ontime. Review the schedule before running the show." - }); + }).wrap()); } else { ui.label("No export published yet."); } @@ -1054,6 +1054,14 @@ impl App { egui::CentralPanel::default().show(ctx, |ui| { if self.tab == Tab::Review { ui.add_enabled_ui(!busy, |ui| self.review(ui)); + } else if self.tab == Tab::Results { + egui::ScrollArea::vertical() + .scroll_bar_visibility( + egui::scroll_area::ScrollBarVisibility::VisibleWhenNeeded, + ) + .show(ui, |ui| { + ui.add_enabled_ui(!busy, |ui| self.pane(ui)); + }); } else { egui::ScrollArea::both() .scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::AlwaysVisible) diff --git a/docs/rundown-converter.md b/docs/rundown-converter.md index 9d585e3..e2d5b7e 100644 --- a/docs/rundown-converter.md +++ b/docs/rundown-converter.md @@ -111,6 +111,8 @@ visually distinct from labels and ordinary actions; the active tab uses the stro **Issues** opens the issue navigator, including sheet-level and gap errors. The table fills the remaining space; its title column expands with the window. Scrollable panels and dialogs use always-visible, solid scrollbars. + The export confirmation wraps paths and instructions without a horizontal + scrollbar; a vertical scrollbar appears only if the content exceeds the window. Preview cells align at the top; blank title lines are omitted without changing original values in the inspector or exports. On narrow windows, timing values stack so corrections remain accessible. The table reserves space