mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-17 06:24:39 +00:00
A press on the focused text widget keeps the focus and the draft
The focus service classifies a press that egui gives to the widget holding the focus (the text of a field in edit) as a Keep: no commit, no focus move. A second click on a number field in edit keeps the field in edit, and the field's root sees no press of its own, so a search field in a menu does not activate and close the menu. This replaces recording the text widget as one of its root's press widgets.
This commit is contained in:
@@ -419,11 +419,6 @@ pub(crate) fn run<C: Component>(
|
||||
now,
|
||||
},
|
||||
);
|
||||
// While the text widget takes the pointer it lies over the root and egui hands it the presses there: it stands for
|
||||
// the root, so the focus service resolves such a press among the root's shapes and the field keeps its focus.
|
||||
if pointer && focusable {
|
||||
crate::runtime::pointer::record_widgets(&ctx, ui.layer_id(), id, &[widget], true);
|
||||
}
|
||||
// Focus that moved to another part of the component leaves the text part like a focus loss: the draft commits.
|
||||
let left_for_part = out.focused && cx.active_part().is_some();
|
||||
if left_for_part {
|
||||
|
||||
@@ -15,13 +15,16 @@ pub(crate) struct PressAt {
|
||||
winner: Option<Winner<Id>>,
|
||||
/// The arena root the winner belongs to.
|
||||
root: Option<Id>,
|
||||
/// The egui widget that takes the press.
|
||||
target: Option<Id>,
|
||||
}
|
||||
|
||||
pub(crate) fn press_at(ctx: &Context) -> Option<PressAt> {
|
||||
// A press the modal's canvas took moves no key focus: the dialog keeps it.
|
||||
egui_focus::primary_press_origin(ctx).filter(|pos| !sampler::admitted_press(ctx, *pos)).map(|pos| {
|
||||
let (winner, root) = pointer::press_winner(ctx, pos, pointer::pass_pointer(ctx).press_targets).unzip();
|
||||
PressAt { winner, root }
|
||||
let targets = pointer::pass_pointer(ctx).press_targets;
|
||||
let (winner, root) = pointer::press_winner(ctx, pos, targets).unzip();
|
||||
PressAt { winner, root, target: targets.click }
|
||||
})
|
||||
}
|
||||
|
||||
@@ -59,7 +62,10 @@ impl State {
|
||||
/// text part to commit its draft when the press leaves it.
|
||||
pub(super) fn classify_press(&mut self, at: &PressAt) {
|
||||
let winner = at.winner.as_ref();
|
||||
let kind = classify_press(winner.map(|winner| winner.sense));
|
||||
// A press on the widget that holds the focus (the text of a field in edit) is that widget's own: it keeps the
|
||||
// focus and the draft.
|
||||
let on_focused = at.target.is_some() && at.target == self.stop_of_focus().map(|rec| rec.stop.root);
|
||||
let kind = if on_focused { PressFocus::Keep } else { classify_press(winner.map(|winner| winner.sense)) };
|
||||
let (owner, part) = winner.map_or((None, None), |winner| (Some(winner.owner), winner.part));
|
||||
let text_stop = self.stop_of_focus().filter(|stop| stop.stop.text).map(|stop| stop.stop.id);
|
||||
let was_text = text_stop.is_some() && kind.commits_draft();
|
||||
|
||||
Reference in New Issue
Block a user