diff --git a/crates/ui-egui/src/shelf.rs b/crates/ui-egui/src/shelf.rs index 9d9e3628..0209b61c 100644 --- a/crates/ui-egui/src/shelf.rs +++ b/crates/ui-egui/src/shelf.rs @@ -27,7 +27,7 @@ const HINT_SIZE: f32 = 10.0; const SAVED_MATERIAL_NAME: &str = "material"; /// Corner radius of a tile's hover and selection highlights, in points const TILE_ROUNDING: f32 = 3.0; -/// The last clicked or right-clicked tile's [`ShelfEntry::key`], kept in egui's memory under this id +/// The last clicked or right-clicked tile's [`ShelfEntry::identity`], kept in egui's memory under this id const SELECTED_TILE: &str = "shelf_selected_tile"; /// The outline widths of the selected tile and of the one in use (the brush's alpha, the shown environment), in points const SELECTED_OUTLINE_WIDTH: f32 = 1.5; @@ -241,8 +241,9 @@ pub fn body(app: &mut TextureCraftApp, ui: &mut Ui) { let folder = app.ui.shelf_path.clone(); let picked_tab = app.ui.shelf_tab; - let mut applicable = crate::shelf_folders::paths(all.iter().filter(|entry| entry.matches(&filter) && crate::shelf_tabs::shows(picked_tab, entry.tab()))); - let matching: Vec = all.into_iter().filter(|entry| entry.in_folder(&folder) && entry.matches(&filter)).collect(); + let searched: Vec = all.into_iter().filter(|entry| entry.matches(&filter)).collect(); + let mut applicable = crate::shelf_folders::paths(searched.iter().filter(|entry| crate::shelf_tabs::shows(picked_tab, entry.tab()))); + let matching: Vec = searched.into_iter().filter(|entry| entry.in_folder(&folder)).collect(); let mut counts: Vec = TABS.iter().map(|(tab, _, _)| matching.iter().filter(|entry| entry.tab() == *tab).count()).collect(); // Saved smart materials list under the grid rather than as tiles, so they count apart @@ -289,6 +290,7 @@ pub fn body(app: &mut TextureCraftApp, ui: &mut Ui) { /// The tiles of `entries` in a scroll area `height` high, then the saved smart materials when `saved_materials` fn grid(app: &mut TextureCraftApp, ui: &mut Ui, ctx: &egui::Context, entries: &[ShelfEntry], height: f32, saved_materials: bool, filter: &str) { let view = app.ui.shelf_view; + let selected: Option<(String, String)> = ctx.data(|data| data.get_temp(egui::Id::unique(SELECTED_TILE))); egui::ScrollArea::vertical() .id_salt("shelf_scroll") .auto_shrink([false, false]) @@ -297,7 +299,8 @@ fn grid(app: &mut TextureCraftApp, ui: &mut Ui, ctx: &egui::Context, entries: &[ .show(ui, |ui| { tiles(ui, |ui| { for entry in entries { - entry_tile(app, ui, ctx, entry, view); + let is_selected = selected.as_ref().is_some_and(|(kind, id)| entry.identity() == (kind.as_str(), id.as_str())); + entry_tile(app, ui, ctx, entry, view, is_selected); } }); if saved_materials { @@ -313,9 +316,9 @@ fn saved_materials_matching(app: &TextureCraftApp, filter: &str) -> usize { /// The search field: a live filter on names (and categories) with a clear button while it has text fn search_field(app: &mut TextureCraftApp, ui: &mut Ui) { - let tk = Tokens::get(ui.ctx()); + let tokens = Tokens::get(ui.ctx()); ui.horizontal(|ui| { - ui.label(RichText::new(ic::MAGNIFYING_GLASS).color(tk.text_dim)); + ui.label(RichText::new(ic::MAGNIFYING_GLASS).color(tokens.text_dim)); let clear_width = if app.ui.shelf_filter.is_empty() { 0.0 } else { ui.spacing().interact_size.y + ui.spacing().item_spacing.x }; let field = egui::TextEdit::singleline(&mut app.ui.shelf_filter).hint_text(tr("Search")).desired_width(ui.available_width() - clear_width); ui.add(field); @@ -450,21 +453,24 @@ fn scan_brushes(app: &mut TextureCraftApp) { #[cfg(target_arch = "wasm32")] fn scan_brushes(_: &mut TextureCraftApp) {} -/// The tile of `entry`: a click applies it, an image resource has a context menu -fn entry_tile(app: &mut TextureCraftApp, ui: &mut Ui, ctx: &egui::Context, entry: &ShelfEntry, view: ShelfView) { +/// The tile of `entry`, outlined when `selected`: a click applies it, an image resource has a context menu +fn entry_tile(app: &mut TextureCraftApp, ui: &mut Ui, ctx: &egui::Context, entry: &ShelfEntry, view: ShelfView, selected: bool) { // An image removed this frame has nothing to show - let (Some(preview), texture) = (entry.preview(app), entry.thumbnail(app, ctx)) else { return }; + if let ShelfEntry::Image(name) = entry + && !app.session.images.contains_key(name) + { + return; + } + let texture = entry.thumbnail(app, ctx); let asset = entry.asset(); - let response = tile_in_view(ui, &mut app.thumbs, texture.as_ref(), || preview, entry.label(), asset.as_ref(), view); + let session = &app.session; + let response = tile_in_view(ui, &mut app.thumbs, texture.as_ref(), || entry.preview(session), entry.label(), asset.as_ref(), view); - let selected_id = egui::Id::unique(SELECTED_TILE); - let key = entry.key(); - let selected = ctx.data(|data| data.get_temp::(selected_id)).is_some_and(|selected| selected == key); if selected || entry.in_use(app) { - let tk = Tokens::get(ctx); + let tokens = Tokens::get(ctx); let width = if selected { SELECTED_OUTLINE_WIDTH } else { IN_USE_OUTLINE_WIDTH }; - ui.painter().rect_stroke(response.rect, TILE_ROUNDING, Stroke::new(width, tk.accent), egui::StrokeKind::Inside); + ui.painter().rect_stroke(response.rect, TILE_ROUNDING, Stroke::new(width, tokens.accent), egui::StrokeKind::Inside); } if entry.includes_randomness() { @@ -472,7 +478,8 @@ fn entry_tile(app: &mut TextureCraftApp, ui: &mut Ui, ctx: &egui::Context, entry } if response.clicked() || response.secondary_clicked() { - ctx.data_mut(|data| data.insert_temp(selected_id, key)); + let (kind, id) = entry.identity(); + ctx.data_mut(|data| data.insert_temp(egui::Id::unique(SELECTED_TILE), (kind.to_string(), id.to_string()))); } if response.clicked() { entry.activate(app); @@ -501,20 +508,20 @@ pub(crate) fn tile( label: &str, drag: Option<&Asset>, ) -> egui::Response { - tile_in_view(ui, thumbs, texture, preview, label, drag, ShelfView::Medium) + tile_in_view(ui, thumbs, texture, || Some(preview()), label, drag, ShelfView::Medium) } -/// [`tile`] at `view`'s size: a grid tile with the name under the thumbnail, or a list row with it beside +/// [`tile`] at `view`'s size: a grid tile with the name under the thumbnail, or a list row with it beside; `preview` runs on hover fn tile_in_view( ui: &mut Ui, thumbs: &mut Thumbs, texture: Option<&egui::TextureHandle>, - preview: impl FnOnce() -> ShelfPreview, + preview: impl FnOnce() -> Option, label: &str, drag: Option<&Asset>, view: ShelfView, ) -> egui::Response { - let tk = Tokens::get(ui.ctx()); + let tokens = Tokens::get(ui.ctx()); let sense = if drag.is_some() { Sense::click_and_drag() } else { Sense::click() }; let (rect, response) = ui.allocate_exact_size(view.tile_size(ui.available_width()), sense); response.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, true, label)); @@ -526,21 +533,21 @@ fn tile_in_view( let painter = ui.painter(); if response.hovered() || response.dragged() { - painter.rect_filled(rect, TILE_ROUNDING, tk.row_hover); + painter.rect_filled(rect, TILE_ROUNDING, tokens.row_hover); } let image_rect = view.thumbnail_rect(rect); - thumbnail(painter, texture, image_rect, &tk); + thumbnail(painter, texture, image_rect, &tokens); if view.name_beside() { let left = image_rect.right() + crate::shelf_view::LIST_NAME_GAP; - let galley = painter.layout_job(one_line(label, rect.right() - left - LABEL_MARGIN, tk.text)); - painter.galley(egui::pos2(left, rect.center().y - galley.size().y * 0.5), galley, tk.text); + let galley = painter.layout_job(one_line(label, rect.right() - left - LABEL_MARGIN, tokens.text)); + painter.galley(egui::pos2(left, rect.center().y - galley.size().y * 0.5), galley, tokens.text); } else { - let galley = painter.layout_job(one_line(label, rect.width() - LABEL_MARGIN, tk.text)); - painter.galley(egui::pos2(rect.center().x - galley.size().x * 0.5, image_rect.bottom() + LABEL_GAP), galley, tk.text); + let galley = painter.layout_job(one_line(label, rect.width() - LABEL_MARGIN, tokens.text)); + painter.galley(egui::pos2(rect.center().x - galley.size().x * 0.5, image_rect.bottom() + LABEL_GAP), galley, tokens.text); } - let big = if response.hovered() { big_preview(ui, thumbs, preview) } else { None }; + let big = if response.hovered() { preview().and_then(|preview| big_preview(ui, thumbs, || preview)) } else { None }; response.on_hover_ui(|ui| hover_preview(ui, texture, big.as_ref(), label)) } diff --git a/crates/ui-egui/src/shelf_entry.rs b/crates/ui-egui/src/shelf_entry.rs index e9bbcbec..cad9e30a 100644 --- a/crates/ui-egui/src/shelf_entry.rs +++ b/crates/ui-egui/src/shelf_entry.rs @@ -3,6 +3,7 @@ use std::path::PathBuf; use serde_json::json; +use texturecraft_engine::Session; use texturecraft_engine::core::ProceduralKind; use texturecraft_engine::core::project::ENVIRONMENTS; use texturecraft_engine::filter_lib::{FILTERS, FilterDef}; @@ -33,7 +34,6 @@ pub(crate) const USER: &str = "user"; pub(crate) const LIBRARIES: [(&str, &str); 3] = [(PROJECT, "Project"), (STARTER, "Starter assets"), (USER, "Your assets")]; /// A shelf tile's asset -#[derive(Clone)] pub(crate) enum ShelfEntry { Material(&'static SmartMaterial), SmartMask(&'static SmartMask), @@ -81,17 +81,17 @@ impl ShelfEntry { } /// The asset's identity across frames: its kind and id - pub(crate) fn key(&self) -> String { + pub(crate) fn identity(&self) -> (&'static str, &str) { match self { - ShelfEntry::Material(material) => format!("material:{}", material.id), - ShelfEntry::SmartMask(mask) => format!("mask:{}", mask.id), - ShelfEntry::Filter(filter) => format!("filter:{}", filter.id), - ShelfEntry::Brush(preset) => format!("brush:{}", preset.id), - ShelfEntry::SavedBrush(path) => format!("saved-brush:{}", path.display()), - ShelfEntry::Alpha(alpha) => format!("alpha:{}", alpha.id), - ShelfEntry::Procedural(kind) => format!("procedural:{kind:?}"), - ShelfEntry::Environment(name) => format!("environment:{name}"), - ShelfEntry::Image(name) => format!("image:{name}"), + ShelfEntry::Material(material) => ("material", material.id), + ShelfEntry::SmartMask(mask) => ("mask", mask.id), + ShelfEntry::Filter(filter) => ("filter", filter.id), + ShelfEntry::Brush(preset) => ("brush", preset.id), + ShelfEntry::SavedBrush(path) => ("saved-brush", path.to_str().unwrap_or_default()), + ShelfEntry::Alpha(alpha) => ("alpha", &alpha.id), + ShelfEntry::Procedural(kind) => ("procedural", kind.label()), + ShelfEntry::Environment(name) => ("environment", name), + ShelfEntry::Image(name) => ("image", name), } } @@ -168,7 +168,7 @@ impl ShelfEntry { } /// What the hover popup renders; None for an image that is gone - pub(crate) fn preview(&self, app: &TextureCraftApp) -> Option { + pub(crate) fn preview(&self, session: &Session) -> Option { Some(match self { ShelfEntry::Material(material) => ShelfPreview::material(material.id), ShelfEntry::SmartMask(mask) => ShelfPreview::SmartMask(mask.id), @@ -178,7 +178,7 @@ impl ShelfEntry { ShelfEntry::Alpha(alpha) => ShelfPreview::Alpha(alpha), ShelfEntry::Procedural(kind) => ShelfPreview::Procedural(*kind), ShelfEntry::Environment(name) => ShelfPreview::Environment(name), - ShelfEntry::Image(name) => ShelfPreview::Image(name.clone(), app.session.images.get(name).cloned()?), + ShelfEntry::Image(name) => ShelfPreview::Image(name.clone(), session.images.get(name).cloned()?), }) } diff --git a/crates/ui-egui/src/shelf_folders.rs b/crates/ui-egui/src/shelf_folders.rs index 0f029033..317d109b 100644 --- a/crates/ui-egui/src/shelf_folders.rs +++ b/crates/ui-egui/src/shelf_folders.rs @@ -53,7 +53,7 @@ pub(crate) fn name(level: usize, segment: &str) -> &str { /// "› All libraries › …": each arrow lists the folders at its level, the names are plain text, a last arrow lists the folders inside pub(crate) fn breadcrumb(app: &mut TextureCraftApp, ui: &mut Ui, paths: &[Vec]) { - let tk = Tokens::get(ui.ctx()); + let tokens = Tokens::get(ui.ctx()); let size = ui.spacing().interact_size.y * ARROW_SCALE; let mut picked: Option> = None; ui.horizontal(|ui| { @@ -83,7 +83,7 @@ pub(crate) fn breadcrumb(app: &mut TextureCraftApp, ui: &mut Ui, paths: &[Vec tr("All libraries"), None => continue, }; - ui.label(RichText::new(shown).strong().color(tk.text_strong)); + ui.label(RichText::new(shown).strong().color(tokens.text_strong)); } }); if let Some(path) = picked { diff --git a/crates/ui-egui/src/shelf_panes.rs b/crates/ui-egui/src/shelf_panes.rs index dee1eb62..9368bddc 100644 --- a/crates/ui-egui/src/shelf_panes.rs +++ b/crates/ui-egui/src/shelf_panes.rs @@ -110,9 +110,9 @@ fn folders(ui: &mut Ui, paths: &[Vec], prefix: &[String], current: &[Str /// A pane's caption with a button at its right fn header(ui: &mut Ui, title: &str, button: impl FnOnce(&mut Ui)) { - let tk = Tokens::get(ui.ctx()); + let tokens = Tokens::get(ui.ctx()); ui.horizontal(|ui| { - ui.label(RichText::new(title.to_uppercase()).size(HEADER_SIZE).color(tk.text_dim)); + ui.label(RichText::new(title.to_uppercase()).size(HEADER_SIZE).color(tokens.text_dim)); ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), button); }); } @@ -131,6 +131,7 @@ fn saved_searches(app: &mut TextureCraftApp, ui: &mut Ui) { if ui.selectable_label(everything, tr("All")).clicked() { crate::shelf_toolbar::reset_query(app); } + let mut deleted = None; for (i, saved) in app.ui.shelf_saved_searches.iter().enumerate() { let same = saved.filter == current.filter && saved.tab == current.tab && saved.path == current.path; diff --git a/crates/ui-egui/src/shelf_tabs.rs b/crates/ui-egui/src/shelf_tabs.rs index 4e2c3e07..cb620500 100644 --- a/crates/ui-egui/src/shelf_tabs.rs +++ b/crates/ui-egui/src/shelf_tabs.rs @@ -49,9 +49,9 @@ fn collapsed(ui: &mut Ui, picked: &mut usize, counts: &[usize], size: f32) { let response = icon_dropdown_button(ui, egui_phosphor::regular::FUNNEL_SIMPLE, tr("Filter by type"), filtering, size); let response = response.on_hover_text(tr("Filter by type")); if filtering { - let tk = crate::theme::Tokens::get(ui.ctx()); + let tokens = crate::theme::Tokens::get(ui.ctx()); let dot = response.rect.left_top() + vec2(size - FILTER_DOT_RADIUS, FILTER_DOT_RADIUS); - ui.painter().circle_filled(dot, FILTER_DOT_RADIUS, tk.accent); + ui.painter().circle_filled(dot, FILTER_DOT_RADIUS, tokens.accent); } egui::Popup::menu(&response).show(|ui| { diff --git a/crates/ui-egui/tests/it/shelf_panel.rs b/crates/ui-egui/tests/it/shelf_panel.rs index 47c61410..e241293f 100644 --- a/crates/ui-egui/tests/it/shelf_panel.rs +++ b/crates/ui-egui/tests/it/shelf_panel.rs @@ -13,7 +13,7 @@ use texturecraft_ui_egui::shelf_view::ShelfView; const REFERENCE_WINDOW: egui::Vec2 = egui::vec2(1920.0, 1032.0); /// A window whose default Assets panel is too narrow for the full type row const NARROW_WINDOW: egui::Vec2 = egui::vec2(1100.0, 1032.0); -/// The shelf's Materials and Smart masks types +/// The types' positions in the shelf's type row (its table is crate-private) const MATERIALS_TYPE: usize = 0; const SMART_MASKS_TYPE: usize = 2; const BRUSHES_TYPE: usize = 4;