diff --git a/crates/pages/src/ui/thumbnails.rs b/crates/pages/src/ui/thumbnails.rs index 60f8b8445..d76957d09 100644 --- a/crates/pages/src/ui/thumbnails.rs +++ b/crates/pages/src/ui/thumbnails.rs @@ -25,15 +25,14 @@ mod stories; use super::view::PageSource; use craft_behavior::{EditEvent, IconId, Selection, SelectionChange, keyed}; -use craft_ui::buttons::Button; use craft_ui::contract::{ - Bind, CollectionEvent, ContextMenuRequest, NoValue, Outcome, PendingDrop, ReorderMove, ReorderRule, Show as _, ShowCollection as _, clicked, + Bind, CollectionEvent, ContextMenuRequest, NoValue, Outcome, PendingDrop, ReorderMove, ReorderRule, Show as _, ShowCollection as _, }; use craft_ui::list::ThumbAspect; use craft_ui::primitives::textures::{Priority, ThumbPaint, ThumbRequest, ThumbnailOptions, Thumbnails}; use craft_ui::runtime::env::{Env, Label}; use craft_ui::style::DataColor; -use craft_ui::tile_grid::{CaptionPlace, GridEvent, ThumbnailSlider, Tile, TileGrid, TileGroup, TileMark, TileZoom, ZoomStep}; +use craft_ui::tile_grid::{CaptionPlace, GridEvent, TailRow, ThumbnailSlider, Tile, TileGrid, TileGroup, TileMark, TileZoom, ZoomStep}; use egui::{Pos2, Response, Ui}; /// The thumbnail zoom: 0.5 to 1.5 of the card thumbnail in steps of 0.25, 1 by default (PdfCraft's @@ -118,7 +117,7 @@ pub enum ThumbnailEvent { Delete(Vec), /// A double-click or Enter on a thumbnail (PowerPoint starts the slide show from it). Activate(usize), - /// A click on the New Slide button ([`PageThumbnails::new_page_row`]). + /// A click, Enter or Space on the New Slide row ([`PageThumbnails::new_page_row`]). NewPage, /// The app's menu for the picked pages is asked for (secondary click, Menu key, Shift+F10). A secondary click on /// an unpicked page makes it the picked set first ([`Selection`](Self::Selection)), without going to it. @@ -257,14 +256,14 @@ impl<'a> PageThumbnails<'a> { self } - /// The New Slide button under the grid (DeckCraft). + /// The New Slide row after the last thumbnail, a row of the grid (DeckCraft). #[must_use] pub fn new_page_row(mut self, on: bool) -> Self { self.new_page_row = on; self } - /// Shows the size row, the grid and the New Slide button. Section headers are the grid's group rows; their + /// Shows the size row and the grid with its New Slide row. Section headers are the grid's group rows; their /// keys count on from the last page (`count + section`), so a header never shares a key with a page. // pdfcraft: crates/ui-egui/src/panels/pages.rs:90 `pages`, :36 `thumbnail_size`, :295 `page_drag`; deckcraft: // crates/ui-egui/src/panels/thumbs.rs:116 `list` (sections, number at the left, hidden and animation marks). @@ -292,6 +291,9 @@ impl<'a> PageThumbnails<'a> { group.detail(words.count.text(section.count as u64, &env.format().integer(section.count as u64))) }) .collect(); + // The New Slide row's key comes after the pages' and the section headers'. + let new_page = count + groups.len(); + let tail: Vec> = if new_page_row { vec![TailRow::new(new_page, words.new_page.clone())] } else { Vec::new() }; let aspect = if count == 0 { 1.0 } else { aspect_of(source, 0) }; let mut grid = TileGrid::::new(label) .selection(Bind::bound(&mut *picked)) @@ -299,12 +301,18 @@ impl<'a> PageThumbnails<'a> { .zoom(scale as f32) .caption(caption) .current(Some(current)) - .groups(&groups); + .groups(&groups) + .tail(&tail); if !groups.is_empty() { grid = grid.collapsible(); } if editable { - grid = grid.reorder(ReorderRule::new()).drag_count(words.count.counted()).takes_files(true).deletable(true); + grid = grid + .reorder(ReorderRule::new()) + .accepts(move |_, _, insert| insert <= new_page) + .drag_count(words.count.counted()) + .takes_files(true) + .deletable(true); } let ctx = ui.ctx().clone(); let thumbnails = Thumbnails::::in_context(&ctx, "page-thumbnails", ThumbnailOptions::new()); @@ -346,6 +354,7 @@ impl<'a> PageThumbnails<'a> { CollectionEvent::Selection(change) => events.push(ThumbnailEvent::Selection(change)), CollectionEvent::LeadMoved { key, .. } if key < count => events.push(ThumbnailEvent::Go(key)), CollectionEvent::Activate(page) if page < count => events.push(ThumbnailEvent::Activate(page)), + CollectionEvent::Activate(key) if key == new_page => events.push(ThumbnailEvent::NewPage), CollectionEvent::Delete(pages) => { let pages: Vec = pages.into_iter().filter(|page| *page < count).collect(); if editable && !pages.is_empty() && pages.len() < count { @@ -363,9 +372,6 @@ impl<'a> PageThumbnails<'a> { _ => {} } } - if new_page_row && clicked(&Button::new(words.new_page.clone()).show(ui)) { - events.push(ThumbnailEvent::NewPage); - } PageThumbnailsOutput { response: shown.response.response, events, drop_target, file_gap } } } diff --git a/crates/pages/tests/it/main.rs b/crates/pages/tests/it/main.rs index de4906c74..7fa696328 100644 --- a/crates/pages/tests/it/main.rs +++ b/crates/pages/tests/it/main.rs @@ -2,4 +2,5 @@ mod setup; mod text_tables; +mod thumbnails; mod views; diff --git a/crates/pages/tests/it/thumbnails.rs b/crates/pages/tests/it/thumbnails.rs new file mode 100644 index 000000000..b50df521a --- /dev/null +++ b/crates/pages/tests/it/thumbnails.rs @@ -0,0 +1,29 @@ +//! The page thumbnails: the New Slide row is a row of the grid and asks for a new page. + +use craft_behavior::Selection; +use craft_pages::ui::fixtures::{DemoPages, PAPER}; +use craft_pages::ui::{PageThumbnails, ThumbnailEvent}; +use craft_ui::testing::{Fixture, trial}; +use egui::vec2; +use std::cell::RefCell; +use std::rc::Rc; + +/// A click on the New Slide row asks for a new page and goes to no page. +#[trial] +fn the_new_slide_row_asks_for_a_new_page() { + let events: Rc>> = Rc::default(); + let seen = Rc::clone(&events); + let pages = DemoPages::new(2); + let mut picked = Selection::default(); + let mut fixture = Fixture::new(move |ui| { + let out = PageThumbnails::new("Pages", &pages, &mut picked, 0, PAPER).new_page_row(true).show(ui); + seen.borrow_mut().extend(out.events); + }); + fixture.room(vec2(300.0, 600.0)); + fixture.settle(); + let row = fixture.by_label("New Slide").expect("the New Slide row"); + fixture.click(&row).settle(); + let events = events.borrow(); + assert!(events.iter().any(|event| matches!(event, ThumbnailEvent::NewPage)), "{events:?}"); + assert!(!events.iter().any(|event| matches!(event, ThumbnailEvent::Go(_) | ThumbnailEvent::Activate(_))), "{events:?}"); +}