dnrops
/
xilem
mirror of https://github.com/linebender/xilem
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor Blur case of on_access_event pass (#643) 

Match how tab focus works in on_text_event pass.
This commit is contained in:
Olivier FAURE 2024-10-11 15:45:22 +02:00 committed by GitHub
parent f5455d2686
commit 72c1bd983d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
masonry/src/passes/event.rs
View File

@ -195,37 +195,34 @@ pub(crate) fn root_on_access_event(
let target = Some(event.target);
let handled = run_event_pass(
let mut handled = run_event_pass(
root,
root_state,
target,
event,
false,
|widget, ctx, event| {
// TODO - Split into "access_event_focus" pass or something similar.
if event.target == ctx.widget_id() {
match event.action {
accesskit::Action::Focus => {
if ctx.is_in_focus_chain() && !ctx.is_disabled() && !ctx.is_focused() {
ctx.request_focus();
ctx.set_handled();
return;
}
}
accesskit::Action::Blur => {
if ctx.is_focused() {
ctx.resign_focus();
ctx.set_handled();
return;
}
}
_ => {}
}
}
widget.on_access_event(ctx, event);
},
);
// Handle focus events
match event.action {
accesskit::Action::Focus if !handled.is_handled() => {
if root.is_still_interactive(event.target) {
root.state.next_focused_widget = Some(event.target);
handled = Handled::Yes;
}
}
accesskit::Action::Blur if !handled.is_handled() => {
if root.state.next_focused_widget == Some(event.target) {
root.state.next_focused_widget = None;
handled = Handled::Yes;
}
}
_ => {}
}
debug!(
focused_widget = root.state.focused_widget.map(|id| id.0),
handled = handled.is_handled(),