diff --git a/crates/font-manager/src/picker.rs b/crates/font-manager/src/picker.rs index 46f9f6180..e9d22941c 100644 --- a/crates/font-manager/src/picker.rs +++ b/crates/font-manager/src/picker.rs @@ -385,6 +385,8 @@ impl Codec for FamilyCodec { struct Typing { draft: Option, lead: Option, + /// The lead's family was proposed by the pointer, so it ends when the pointer leaves the rows. + lead_by_pointer: bool, hide_classes: bool, expanded: Vec, rested: Vec, @@ -561,6 +563,7 @@ impl Component for FontPicker<'_> { // The one place the picker forgets what belongs to an open list. let typing = cx.memory::(); typing.lead = None; + typing.lead_by_pointer = false; typing.expanded.clear(); typing.rested.clear(); if matches!(cx.gesture(), Some(craft_behavior::GesturePhase::Begin | craft_behavior::GesturePhase::Update)) { diff --git a/crates/font-manager/src/picker/rows.rs b/crates/font-manager/src/picker/rows.rs index cc750e5ea..5628391db 100644 --- a/crates/font-manager/src/picker/rows.rs +++ b/crates/font-manager/src/picker/rows.rs @@ -12,7 +12,7 @@ use craft_ui::buttons::{Button, ToggleButton}; use craft_ui::choice::{Radio, RadioGroup}; use craft_ui::contract::overlay::Dismiss; use craft_ui::contract::{ - Bind, CollectionEvent, Cx, Edit as _, Overlay, OverlayUi, Overlays as _, Props as _, Remember as _, Show as _, ShowCollection as _, + Bind, CollectionEvent, Cx, Edit as _, LeadSource, Overlay, OverlayUi, Overlays as _, Props as _, Remember as _, Show as _, ShowCollection as _, ShowContainer as _, WordSetCx as _, clicked, }; use craft_ui::display::{Picture, PictureSize, Text}; @@ -306,6 +306,8 @@ pub(super) fn popup<'a>(picker: &mut FontPicker<'a>, ui: &mut OverlayUi<'_>, cx: let banner_text = picker.preview_text; let name = words.list.clone(); let mut stars: Vec<(String, bool)> = Vec::new(); + let mut over_rows = false; + let mut under_pointer: Option = None; let events = ui.show(popup, Overlay::dropdown().dismiss(Dismiss::new().focus_left(true)), |ui, _| { let mut events = Vec::new(); Stack::new().show(ui, |ui, _| { @@ -374,6 +376,9 @@ pub(super) fn popup<'a>(picker: &mut FontPicker<'a>, ui: &mut OverlayUi<'_>, cx: } } }); + over_rows = rows.response.contains_pointer(); + let pointer = ui.ctx().pointer_hover_pos(); + under_pointer = pointer.and_then(|at| rows.shown.iter().find(|row| row.rect.contains(at)).map(|row| row.key.clone())); events = rows.events; }); }); @@ -383,9 +388,11 @@ pub(super) fn popup<'a>(picker: &mut FontPicker<'a>, ui: &mut OverlayUi<'_>, cx: let mut picked: Option = None; for event in events.into_iter().flatten() { match event { - CollectionEvent::LeadMoved { key, .. } => { + CollectionEvent::LeadMoved { key, by } => { if let Some(family) = slot_of(&slots, &key).and_then(Slot::family) { - cx.memory::().lead = Some(family.to_owned()); + let typing = cx.memory::(); + typing.lead = Some(family.to_owned()); + typing.lead_by_pointer = by == LeadSource::Pointer; cx.propose(family.to_owned()); } } @@ -413,6 +420,27 @@ pub(super) fn popup<'a>(picker: &mut FontPicker<'a>, ui: &mut OverlayUi<'_>, cx: } } cx.memory::().hide_classes = hide_classes; + // A preview the pointer proposed ends when the pointer leaves the rows (a keyed row keeps its preview). The + // collection keeps its lead on the row, so the pointer coming back to that row reports no move: the row under it + // proposes again. + let (by_pointer, led) = { + let typing = cx.memory::(); + (typing.lead_by_pointer, typing.lead.is_some()) + }; + if by_pointer && !over_rows { + let typing = cx.memory::(); + typing.lead = None; + typing.lead_by_pointer = false; + cx.cancel(craft_behavior::CancelReason::Dismissed); + } else if over_rows + && !led + && let Some(family) = under_pointer.and_then(|key| slot_of(&slots, &key).and_then(Slot::family).map(str::to_owned)) + { + let typing = cx.memory::(); + typing.lead = Some(family.clone()); + typing.lead_by_pointer = true; + cx.propose(family); + } if let Some(mut changed) = settings.clone().filter(|_| !stars.is_empty()) { for (family, on) in &stars { changed.set_favorite(family, *on); diff --git a/crates/font-manager/tests/it/picker.rs b/crates/font-manager/tests/it/picker.rs index 100c4ac7b..cc4795006 100644 --- a/crates/font-manager/tests/it/picker.rs +++ b/crates/font-manager/tests/it/picker.rs @@ -121,7 +121,7 @@ fn similar_fonts_put_the_current_family_first_and_leave_the_list_alone_without_a } #[trial] -fn the_row_under_the_pointer_is_proposed_as_the_preview_and_closing_the_list_cancels_it() { +fn the_row_under_the_pointer_is_proposed_as_the_preview_until_the_pointer_leaves_or_the_list_closes() { let (mut fx, seen) = rig(catalog_of(&[INTER_REGULAR, epaint_default_fonts::HACK_REGULAR]), vec![]); assert_eq!(seen.borrow().preview, None, "a closed list previews nothing"); open(&mut fx); @@ -131,6 +131,14 @@ fn the_row_under_the_pointer_is_proposed_as_the_preview_and_closing_the_list_can assert_eq!(seen.borrow().preview.as_deref(), Some("Hack"), "the hovered row proposes its family"); assert!(seen.borrow().picks.is_empty(), "a hover picks nothing"); + fx.frame(vec![Event::PointerGone]); + fx.settle(); + assert_eq!(seen.borrow().preview, None, "the preview ends when the pointer leaves the rows"); + let hack = fx.by_label("Hack").expect("the Hack row"); + fx.frame(vec![Event::PointerMoved(hack.center())]); + fx.settle(); + assert_eq!(seen.borrow().preview.as_deref(), Some("Hack"), "the pointer back on the row previews it again"); + fx.key(Key::Escape, Modifiers::NONE); fx.settle(); assert_eq!(seen.borrow().preview, None, "a list closed without a pick cancels the preview");