Merge pull request #8332 from dotCooCoo/fix/issue-7095

Fix #7095: a double-click on a pattern swatch no longer paints its tile
This commit is contained in:
BFlat
2026-11-18 03:21:20 +07:00
committed by GitHub
2 changed files with 47 additions and 1 deletions
+4 -1
View File
@@ -147,7 +147,10 @@ pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], se
}),
_ => resp.on_hover_text(shown),
};
if resp.clicked() {
// Only the first click of a run of quick clicks applies and selects the swatch. The second
// opens the editor, and the later ones (counted as triple clicks) do nothing. Pattern editing
// selects the tile art, and a later click would paint it with the pattern itself.
if resp.clicked() && !resp.double_clicked() && !resp.triple_clicked() {
ev.clicked = Some((e.clone(), ui.input(|i| i.modifiers)));
}
}
@@ -518,6 +518,49 @@ fn list_view_rows_take_double_clicks_and_folder_clicks_select_the_group() {
assert_eq!(describe(&Paint::solid(Color::gray(0.5)), true, true), "Spot Color, Grayscale");
}
/// The test sends each click on its own frame, as a real pointer does. The first click paints the
/// selected art with the pattern. The second click opens pattern editing on that pattern, which
/// selects the tile art. Neither the second click nor quick clicks after it paint the tile art
/// with the pattern itself (#7095).
#[test]
fn double_clicking_a_pattern_edits_it_without_painting_its_tile() {
let mut app = app();
let tile = app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap();
app.run("object.pattern.make", json!({"ids": [tile], "name": "Dots", "width": 20, "height": 20})).unwrap();
app.run("object.pattern.done", json!({})).unwrap();
let art = app.run("shape.rectangle", json!({"x": 100, "y": 100, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap();
for view in [View::SmallThumb, View::SmallList] {
// A solid fill each time, so the first click must paint the art in this view too.
app.run("paint.setFill", json!({"ids": [art], "color": "#2050a0"})).unwrap();
app.run("select.set", json!({"ids": [art]})).unwrap();
app.ui.swatches_view = view;
let ctx = context();
// Only the pattern shows, so its row is on screen in the list view too.
set_pstate(&ctx, "swatch-show-find", true);
ctx.data_mut(|d| d.insert_temp(find_id(), "Dots".to_string()));
frame(&mut app, &ctx, vec![], 0.0, show);
let at = tile_center(&ctx, "Dots");
let button = |pressed| Event::PointerButton { pos: at, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE };
// Four quick clicks: a double-click, then two more that count as triple clicks.
let mut events = vec![Event::PointerMoved(at)];
for _ in 0..4 {
events.extend([button(true), button(false)]);
}
for (i, e) in events.into_iter().enumerate() {
frame(&mut app, &ctx, vec![e], 1.0 + i as f64 * 0.05, show);
}
let d = &app.session.doc().unwrap().doc;
let pe = d.pattern_edit.as_ref().unwrap_or_else(|| panic!("{view:?}: the double-click opens pattern editing"));
assert_eq!(pe.pattern, "Dots");
let fill = d.node(vectorcraft_doc::NodeId(art)).unwrap().appearance.fill_paint();
assert!(matches!(fill, Paint::Pattern { pattern, .. } if pattern == "Dots"), "{view:?}: the first click paints the art");
for n in d.node(pe.layer).unwrap().children().unwrap() {
assert!(!matches!(n.appearance.fill_paint(), Paint::Pattern { .. }), "{view:?}: the tile keeps its own fill: {}", app.ui.status);
}
app.run("object.pattern.done", json!({})).unwrap();
}
}
#[test]
fn dragging_tiles_reorders_and_moves_into_groups_as_one_undo_step_each() {
let mut app = app();