Skip to content

Change Focus keyboard action to check borders closest to focus direction #1786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −12
Open

Change Focus keyboard action to check borders closest to focus direction #1786

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f85d80
shell: Change focus action to check borders closest to the FocusDirec…
iexavl Nov 5, 2025
7cc1a5d
fix: return maximum focus priority when borders perfectly overlap
iexavl Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions src/shell/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3759,27 +3759,59 @@ impl Shell {
let next = match direction {
FocusDirection::Up => elements
.filter(|(_, other_geo)| other_geo.loc.y <= geometry.loc.y)
.min_by_key(|(_, other_geo)| {
let res = geometry.loc.y - other_geo.loc.y;
if res.is_positive() { res } else { i32::MAX }
.max_by_key(|(_, other_geo)| {
let other_y_h = other_geo.loc.y + other_geo.size.h;
let delta = geometry.loc.y - other_y_h;
if delta == 0 {
return i32::MAX;
}
if delta.is_positive() {
i32::MAX - delta
} else {
delta
}
}),
FocusDirection::Down => elements
.filter(|(_, other_geo)| other_geo.loc.y > geometry.loc.y)
.max_by_key(|(_, other_geo)| {
let res = geometry.loc.y - other_geo.loc.y;
if res.is_negative() { res } else { i32::MIN }
.min_by_key(|(_, other_geo)| {
let current_y_h = geometry.loc.y + geometry.size.h;
let delta = current_y_h - other_geo.loc.y;
if delta == 0 {
return i32::MIN;
}
if delta.is_negative() {
i32::MIN - delta
} else {
delta
}
}),
FocusDirection::Left => elements
.filter(|(_, other_geo)| other_geo.loc.x <= geometry.loc.x)
.min_by_key(|(_, other_geo)| {
let res = geometry.loc.x - other_geo.loc.x;
if res.is_positive() { res } else { i32::MAX }
.max_by_key(|(_, other_geo)| {
let other_x_w = other_geo.loc.x + other_geo.size.w;
let delta = geometry.loc.x - other_x_w;
if delta == 0 {
return i32::MAX;
}
if delta.is_positive() {
i32::MAX - delta
} else {
delta
}
}),
FocusDirection::Right => elements
.filter(|(_, other_geo)| other_geo.loc.x > geometry.loc.x)
.max_by_key(|(_, other_geo)| {
let res = geometry.loc.x - other_geo.loc.x;
if res.is_negative() { res } else { i32::MIN }
.min_by_key(|(_, other_geo)| {
let current_x_w = geometry.loc.x + geometry.size.w;
let delta = current_x_w - other_geo.loc.x;
if delta == 0 {
return i32::MIN;
}
if delta.is_negative() {
i32::MIN - delta
} else {
delta
}
}),
_ => return FocusResult::None,
}
Expand Down