Fix High Contrast coordinate labels on white helper tiles

This commit is contained in:
Dandaedre 2026-11-17 14:08:48 +01:00
parent 8c3ab04bf4
commit f57a301de8
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
4 changed files with 47 additions and 12 deletions

2
Cargo.lock generated
View File

@ -548,7 +548,7 @@ dependencies = [
[[package]]
name = "canvas-pilot"
version = "0.9.21"
version = "0.9.22"
dependencies = [
"base64",
"craft-dwg",

View File

@ -4,7 +4,7 @@ default-members = ["crates/canvas-pilot"]
resolver = "3"
[workspace.package]
version = "0.9.21"
version = "0.9.22"
edition = "2024"
license = "MIT"
repository = "https://proxy.dandaedre.com/gitea/idle-org/canvas-pilot"

View File

@ -927,15 +927,14 @@ fn paint_pattern_clipped(
if !cell.intersects(clip) {
continue;
}
p.rect_filled(
cell,
0.0,
if (row + col) % 2 == 0 {
palette.pattern[0]
} else {
palette.pattern[1]
},
);
let tile = (row + col) % 2;
let label_color = if theme::Theme::current(painter.ctx()) == theme::Theme::HighContrast
{
palette.pattern[1 - tile]
} else {
palette.text
};
p.rect_filled(cell, 0.0, palette.pattern[tile]);
p.rect_stroke(
cell,
0.0,
@ -948,7 +947,7 @@ fn paint_pattern_clipped(
Align2::CENTER_CENTER,
format!("{},{}", col, row),
FontId::proportional(11.0),
palette.text,
label_color,
);
}
}
@ -1808,6 +1807,37 @@ mod preview_paint_tests {
}
}
#[test]
fn high_contrast_coordinate_labels_contrast_with_both_tile_colors() {
let ctx = egui::Context::default();
theme::Theme::HighContrast.apply(&ctx);
let rect = Rect::from_min_size(Pos2::new(20.0, 20.0), Vec2::new(1000.0, 600.0));
let output = ctx.run_ui(egui::RawInput::default(), |ui| {
paint_pattern_clipped(ui.painter(), rect, Source::default(), Crop::default(), rect);
});
let mut labels = 0;
for shape in &output.shapes {
if let egui::Shape::Text(text) = &shape.shape {
let (col, row) = text.galley.text().split_once(',').unwrap();
let tile = (col.parse::<usize>().unwrap() + row.parse::<usize>().unwrap()) % 2;
let expected = if tile == 0 {
egui::Color32::WHITE
} else {
egui::Color32::BLACK
};
assert!(
text.galley
.job
.sections
.iter()
.all(|section| section.format.color == expected)
);
labels += 1;
}
}
assert_eq!(labels, 60);
}
#[test]
fn actual_layer_stays_clipped_with_layer_and_source_masks() {
use canvas_pilot::formats::{Mask, MaskOrigin};

View File

@ -4,6 +4,11 @@
## Unreleased
### v0.9.22
- Fix High Contrast source-helper coordinates disappearing on white checkerboard
tiles: labels now use black on white tiles and white on black tiles.
### v0.9.21
- Keep the More themes picker open after each selection so multiple themes can