mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-19 09:13:34 +00:00
Window: a document that keeps its pane keeps its zoom when another closes
Panes refit a view when its slot or its place in the layout changes, not when the number of panes changes. Closing the sixth document in 6-Up leaves the other five in their panes with their zoom and scroll; side by side and stacked, every pane changes size and each document fits its new pane.
This commit is contained in:
@@ -322,16 +322,18 @@ pub(crate) fn tiled_area(app: &mut VectorcraftApp, ui: &mut Ui) -> bool {
|
||||
app.canvas.panes.shown.retain(|s, _| live.contains(s));
|
||||
app.canvas.panes.pending.retain(|s, _| live.contains(s));
|
||||
app.canvas.panes.fits.retain(|s, _| live.contains(s));
|
||||
// A window opened, closed, floated or docked changes the panes, and so does coming back to the
|
||||
// panes from one window: each window fits its new pane. With as many panes as before, only a
|
||||
// window that moved to another pane fits it, as when a tab brings its window into the last pane
|
||||
// of a 2-up to 6-up layout: the others keep their zoom and scroll. Windows are compared by
|
||||
// their slots, since a closed document shifts the indices of the documents after it.
|
||||
// A window that moved to another pane fits it, and so does a window whose pane changed place or
|
||||
// size because a window opened, closed, floated or docked, or because the panes came back from
|
||||
// one window. A window that keeps its pane keeps its zoom and scroll, as when a tab brings its
|
||||
// window into the last pane of a 2-up to 6-up layout, or when 6-Up loses its sixth document.
|
||||
// Windows are compared by their slots, since a closed document shifts the indices of the
|
||||
// documents after it, and panes by their place in the layout.
|
||||
let before = std::mem::take(&mut app.canvas.panes.last_slots);
|
||||
let now: Vec<Option<Slot>> = shown.iter().map(|w| slot(app, *w)).collect();
|
||||
let same_panes = before.len() == now.len();
|
||||
let unit = egui::Rect::from_min_size(pos2(0.0, 0.0), vec2(1.0, 1.0));
|
||||
let (cells_before, cells_now) = (layout_cells(layout, before.len(), unit), layout_cells(layout, now.len(), unit));
|
||||
for (i, (w, s)) in shown.iter().zip(&now).enumerate() {
|
||||
if same_panes && s.is_some() && before.get(i) == Some(s) {
|
||||
if s.is_some() && before.get(i) == Some(s) && cells_before.get(i) == cells_now.get(i) {
|
||||
continue;
|
||||
}
|
||||
if let Some(v) = crate::doc_windows::view_mut(app, *w) {
|
||||
|
||||
@@ -232,6 +232,39 @@ fn closing_a_document_in_an_n_up_layout_fits_the_documents_that_change_panes() {
|
||||
assert!(v.fitted && (v.zoom - fit_zoom(area, Rect::new(0.0, 0.0, 400.0, 300.0), 0.0, 1.0)).abs() < 1e-9, "it fits its new pane: {v:?}");
|
||||
}
|
||||
|
||||
/// 6-Up keeps its three columns and two rows with five documents: closing the sixth leaves the
|
||||
/// others in their panes with the zoom they had. Side by side, closing one widens every pane, and
|
||||
/// each document fits its new pane.
|
||||
#[test]
|
||||
fn closing_a_document_keeps_the_zoom_of_the_documents_whose_panes_stay() {
|
||||
let mut app = app_with(6);
|
||||
let ctx = egui::Context::default();
|
||||
app.run("document.activate", json!({"index": 0})).unwrap();
|
||||
app.run("window.arrange.tile", json!({"layout": "6up"})).unwrap();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
assert_eq!(panes(&app).0, [0, 1, 2, 3, 4, 5]);
|
||||
app.views[1].zoom *= 2.0;
|
||||
let zoomed = app.views[1].zoom;
|
||||
app.run("file.close", json!({"index": 5})).unwrap();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let (docs, rects) = panes(&app);
|
||||
assert_eq!((docs, columns_and_rows(&rects)), (vec![0, 1, 2, 3, 4], (3, 2)));
|
||||
assert_eq!(app.views[1].zoom, zoomed, "the document that kept its pane keeps its zoom");
|
||||
|
||||
let mut app = app_with(3);
|
||||
app.run("document.activate", json!({"index": 0})).unwrap();
|
||||
app.run("window.arrange.tile", json!({"layout": "vertical"})).unwrap();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
app.views[1].zoom *= 2.0;
|
||||
app.run("file.close", json!({"index": 2})).unwrap();
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
let (docs, rects) = panes(&app);
|
||||
assert_eq!(docs, [0, 1]);
|
||||
let area = view_rects(&app, rects[1], ctx.pixels_per_point()).1;
|
||||
let v = app.views[1];
|
||||
assert!(v.fitted && (v.zoom - fit_zoom(area, Rect::new(0.0, 0.0, 400.0, 300.0), 0.0, 1.0)).abs() < 1e-9, "it fits its wider pane: {v:?}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tile_refuses_a_layout_it_does_not_have() {
|
||||
let mut app = app_with(3);
|
||||
|
||||
Reference in New Issue
Block a user