From e7caaf806eb8717f323870490a9a931d62258ff9 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 17 Nov 2026 16:04:29 +0100 Subject: [PATCH] Keep mapping and import scrollbars visible when content overflows --- Cargo.lock | 2 +- Cargo.toml | 2 +- crates/canvas-pilot/src/device_ui.rs | 78 +++++++++++++++++++++++++++- docs/canvas-pilot/changelog.md | 6 +++ docs/canvas-pilot/guide/device.md | 5 +- 5 files changed, 89 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95eec36..062e725 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -548,7 +548,7 @@ dependencies = [ [[package]] name = "canvas-pilot" -version = "0.9.32" +version = "0.9.33" dependencies = [ "base64", "craft-dwg", diff --git a/Cargo.toml b/Cargo.toml index a64e42d..4d01a56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"] resolver = "3" [workspace.package] -version = "0.9.32" +version = "0.9.33" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot" diff --git a/crates/canvas-pilot/src/device_ui.rs b/crates/canvas-pilot/src/device_ui.rs index b1d34ce..d159784 100644 --- a/crates/canvas-pilot/src/device_ui.rs +++ b/crates/canvas-pilot/src/device_ui.rs @@ -808,8 +808,20 @@ impl Editor { egui::Window::new(title).id(window_id) .enabled(!self.format_draft.as_ref().is_some_and(|d| d.pending(&self.layout))) .open(&mut open).default_width(660.0).collapsible(false) - .max_height((ctx.content_rect().height() - 100.0).max(200.0)).vscroll(true) + .max_height((ctx.content_rect().height() - 100.0).max(200.0)) .show(ctx, |ui| { + // Keep overflow discoverable even when the pointer is outside the window. + ui.spacing_mut().scroll = egui::style::ScrollStyle { + bar_width: 12.0, + handle_min_length: 24.0, + foreground_color: true, + ..egui::style::ScrollStyle::solid() + }; + egui::ScrollArea::vertical() + .id_salt("device-mapping-content") + .max_height((ctx.content_rect().height() - 150.0).max(150.0)) + .scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::VisibleWhenNeeded) + .show(ui, |ui| { if self.device.online() { ui.horizontal(|ui| { ui.label(tr(ui.ctx(), "ui.apply-to")); @@ -932,6 +944,7 @@ impl Editor { } ui.separator(); + }); }); if !open && !self.device.prepare_send @@ -1531,6 +1544,69 @@ mod tests { assert!(load_linked_layers(&mut layout, &snapshot, &[(id, link)]).is_err()); assert_eq!(*layout.layers(), before); } + #[test] + fn overflowing_mapping_and_import_keep_solid_scrollbars_without_hover() { + for prepare_send in [false, true] { + let ctx = egui::Context::default(); + ctx.global_style_mut(|style| style.animation_time = 0.0); + let original_scroll = ctx.style_of(egui::Theme::Dark).spacing.scroll; + let mut app = Editor::default(); + for _ in 0..30 { + app.layout.add_layer().unwrap(); + } + app.device.open = true; + app.device.prepare_send = prepare_send; + app.device.scope = TransferScope::All; + let mut snapshot = linked_test_snapshot(); + let template = snapshot.screens[0].layers[0].clone(); + snapshot.screens[0].layers = (1..=32) + .map(|i| { + let mut layer = template.clone(); + layer.id = i.to_string(); + layer + }) + .collect(); + app.device.destinations = vec![Destination::Skip; 32]; + app.device.snapshot = Some(snapshot); + let before = app.project(); + let mut output = None; + for time in [0.0, 1.0, 10.0] { + output = Some(ctx.run_ui( + egui::RawInput { + screen_rect: Some(Rect::from_min_size( + Pos2::ZERO, + Vec2::new(1000.0, 720.0), + )), + time: Some(time), + events: vec![egui::Event::PointerGone], + ..Default::default() + }, + |_| app.device_window(&ctx), + )); + } + let output = output.unwrap(); + let solid_bars = output + .shapes + .iter() + .filter(|shape| { + matches!(&shape.shape, + egui::Shape::Rect(rect) if (rect.rect.width() - 12.0).abs() < 0.01 + && rect.rect.height() >= 24.0 && rect.fill.a() == 255) + }) + .count(); + assert!( + solid_bars >= 2, + "track and thumb must remain opaque: {prepare_send}" + ); + assert_eq!(app.project(), before); + assert_eq!( + ctx.style_of(egui::Theme::Dark).spacing.scroll, + original_scroll + ); + assert!(app.device.pending.is_none()); + } + } + #[test] fn load_keeps_mapping_window_contents_visible() { let ctx = egui::Context::default(); diff --git a/docs/canvas-pilot/changelog.md b/docs/canvas-pilot/changelog.md index f6d753b..fd60652 100644 --- a/docs/canvas-pilot/changelog.md +++ b/docs/canvas-pilot/changelog.md @@ -4,6 +4,12 @@ ## Unreleased +### v0.9.33 + +- Device mapping/transfer and import now use wider solid scrollbars whenever their + content overflows. Bars remain visible with the pointer elsewhere so additional + layer rows and controls are discoverable, without changing mappings or transfers. + ### v0.9.32 - Made dragging layers out of folders easier: doubled the child-row gutter and diff --git a/docs/canvas-pilot/guide/device.md b/docs/canvas-pilot/guide/device.md index 936a9d3..fee03ad 100644 --- a/docs/canvas-pilot/guide/device.md +++ b/docs/canvas-pilot/guide/device.md @@ -70,7 +70,10 @@ are explained in the review. Imports are one undoable edit. Open **Export → Midra mapping & transfer…** even while offline, then use **Connection settings…** to connect. Mapping and transfer controls appear once -device data is available. Choose editor layers, +device data is available. When more rows or controls extend below the window, +a solid scrollbar stays visible even while the pointer is elsewhere. Scroll to +review all layers; the import list uses the same visible scrollbar behavior. +Choose editor layers, map each to a Midra layer, select **Preview** or **Program**, and select a container strategy: **Output-sized** or **Source aspect**. Expand **Exact device changes** to review sizes, centers, crop values and aspect, then click **Send mapped layers**. The final row groups **Load linked layers**