Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Merge PR #308

Claude99fa19099b8e
diff --cc crates/ui-egui/src/lib.rs
index 773ac363b,8ceb9c11e..479825bfa
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -29,10 -29,10 +29,12 @@@ pub mod widgets
#[cfg(test)]
mod tests_curve;
#[cfg(test)]
+mod tests_filmstrip;
+#[cfg(test)]
mod tests_grid;
#[cfg(test)]
+ mod tests_labels;
+ #[cfg(test)]
mod tests_library_problem;
#[cfg(test)]
mod tests_masking;
diff --cc crates/ui-egui/src/panels/detail.rs
index cb74bb517,732dd019f..04c40fb47
--- a/crates/ui-egui/src/panels/detail.rs
+++ b/crates/ui-egui/src/panels/detail.rs
@@@ -1606,14 -1526,17 +1606,19 @@@ pub(crate) fn filmstrip(app: &mut Light
}
let resp = ui.interact(cr, egui::Id::new(("film", id.0)), Sense::click());
register(ui.ctx(), format!("film:{}", id.0), cr);
- let sel = Some(*id) == active;
+ let state = app.session.selection.state_of(*id);
+ let sel = state == lightcraft_engine::SelectionState::Active;
let p = ui.painter();
- if state != lightcraft_engine::SelectionState::NotSelected {
- p.rect_filled(cr, 0.0, t.cell_selected);
+ let label = app.session.catalog.photo(*id).and_then(|ph| ph.label);
- let base = if sel {
++ let selected = state != lightcraft_engine::SelectionState::NotSelected;
++ let base = if selected {
+ t.cell_selected
} else if resp.hovered() {
- p.rect_filled(cr, 0.0, t.cell_selected.gamma_multiply(0.6));
- }
+ t.cell_selected.gamma_multiply(0.6)
+ } else {
+ t.canvas
+ };
- p.rect_filled(cr, 0.0, crate::theme::label_background(base, label, sel));
++ p.rect_filled(cr, 0.0, crate::theme::label_background(base, label, selected));
let names = app.ui.settings.film_names;
if let Some(ph) = app.session.catalog.photo(*id).filter(|_| names) {
let name = ph.file_name.rsplit_once('.').map(|(n, _)| n).unwrap_or(&ph.file_name);
diff --cc crates/ui-egui/src/panels/grid.rs
index 9d63bd085,7428b4676..1ef6beb05
--- a/crates/ui-egui/src/panels/grid.rs
+++ b/crates/ui-egui/src/panels/grid.rs
@@@ -493,10 -486,11 +493,11 @@@ fn cell(app: &mut LightcraftApp, ui: &m
spoken.push_str(&format!(", {} label", app.session.catalog.label_name(l)));
}
resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::SelectableLabel, true, selected, &spoken));
- let active = app.session.selection.active == Some(id);
+ let active = state == lightcraft_engine::SelectionState::Active;
let p = ui.painter();
let img_rect = if square {
- p.rect_filled(r, 0.0, if selected { t.cell_selected } else { t.cell });
+ let base = if selected { t.cell_selected } else { t.cell };
+ p.rect_filled(r, 0.0, crate::theme::label_background(base, photo.label, selected));
Rect::from_min_max(r.min + vec2(10.0, 24.0), r.max - vec2(10.0, 10.0))
} else {
r