shifathosn
/
lightcraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Batch 32: arrows over a slider nudge it (#1264), the toast area doesn't fade in (#1262), #1282's test runs on Windows

This commit is contained in:
bflatastic 2026-10-13 11:42:47 +07:00
parent 1d70cf6358
commit 2e877ad476
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ui-egui/src/panels/mod.rs
View File

@ -90,6 +90,8 @@ pub fn toast(app: &mut LightcraftApp, ctx: &egui::Context) {
egui::Area::new(egui::Id::new("toast"))
.order(egui::Order::Foreground)
.movable(false)
// (the toast fades by its own clock)
.fade_in(false)
.pivot(Align2::CENTER_CENTER)
.fixed_pos(pos2(canvas.center().x, canvas.bottom() - 60.0))
.show(ctx, |ui| {

6
crates/ui-egui/src/shortcuts.rs
View File

@ -538,6 +538,12 @@ pub fn handle(app: &mut LightcraftApp, ctx: &egui::Context) {
}
// Up / Down in the grids go to the cell above / below (the filmstrip steps one photo)
if matches!(f.as_str(), "library.up" | "library.down") {
// over a slider the arrows nudge it (widgets::slider takes the key)
let over_slider =
ctx.pointer_hover_pos().is_some_and(|p| app.widgets.iter().any(|(id, r)| id.starts_with("slider:") && r.contains(p)));
if over_slider {
continue;
}
match crate::panels::grid::row_distance(app, f == "library.down") {
Some(0) => {}
Some(rows) => {

2
crates/ui-egui/src/tests_labels.rs
View File

@ -75,6 +75,8 @@ fn label_tints_grid_and_filmstrip_chrome_without_changing_photo_pixels() {
fn label_toast_has_pale_colour_and_rating_restores_neutral_style() {
let mut h = app(ViewMode::SquareGrid);
h.app.run("photo.label", json!({"label": "red"})).unwrap();
// (two frames: the toast is an egui Area, sized in its first frame and painted from the second, #1262)
h.step();
h.step();
let at = egui::pos2(h.app.canvas_rect.unwrap().center().x, h.app.canvas_rect.unwrap().bottom() - 45.0);
let red = pixel(&h.paint(), at);

6
crates/ui-egui/src/tests_panels.rs
View File

@ -1727,8 +1727,8 @@ fn a_folder_menu_locates_its_missing_tree_only() {
std::fs::write(path, b"photo").unwrap();
}
let root = base.to_string_lossy().replace('\\', "/");
let old = format!("{root}/old");
// (the missing tree is not on disk: a plain root, so the Folders section lists it the same on every platform)
let old = "/lc-locate-old".to_string();
let old_trip = format!("{old}/trip");
let paths = [format!("{old_trip}/a.jpg"), format!("{old_trip}/day2/b.jpg"), format!("{old}/other/c.jpg")];
let picked = new_trip.to_string_lossy().to_string();
@ -1756,7 +1756,7 @@ fn a_folder_menu_locates_its_missing_tree_only() {
})
.collect();
assert!(sources.contains(&new_trip.join("a.jpg").to_string_lossy().to_string()), "{sources:?}");
assert!(sources.contains(&new_trip.join("day2/b.jpg").to_string_lossy().to_string()), "{sources:?}");
assert!(sources.contains(&new_trip.join("day2").join("b.jpg").to_string_lossy().to_string()), "{sources:?}");
assert!(sources.contains(&format!("{old}/other/c.jpg")), "another missing folder stays untouched: {sources:?}");
}