pogmommy/worf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make rollover optional

Browse source
This commit is contained in:
Alexander Mohr 2025-07-13 12:09:02 +02:00
parent 3d9d5689c7
commit acfaad5f06
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
worf/src/lib/config.rs
View file

@ -637,6 +637,10 @@ pub struct Config {
/// Auto select when only 1 possible choice is left
#[clap(long = "auto-select-on-search")]
auto_select_on_search: Option<bool>,
/// Jump to the first/last entry when at the end/start and down/up is pressed
/// Defaults to true
rollover: Option<bool>,
}
impl Config {
@ -926,6 +930,11 @@ impl Config {
pub fn auto_select_on_search(&self) -> bool {
self.auto_select_on_search.unwrap_or(false)
}
#[must_use]
pub fn rollover(&self) -> bool {
self.rollover.unwrap_or(true)
}
}
fn default_false() -> bool {

24
worf/src/lib/gui.rs
View file

@ -1083,10 +1083,10 @@ fn handle_key_press<T: Clone + 'static + Send>(
}
}
gdk4::Key::Up => {
return move_selection(ui, true);
return move_selection(ui, meta, &Direction::Up);
}
gdk4::Key::Down => {
return move_selection(ui, false);
return move_selection(ui, meta, &Direction::Down);
}
_ => {
if let Some(c) = keyboard_key.to_unicode() {
@ -1109,7 +1109,21 @@ fn handle_key_press<T: Clone + 'static + Send>(
Propagation::Proceed
}
fn move_selection<T: Clone + Send + 'static>(ui: &Rc<UiElements<T>>, up: bool) -> Propagation {
#[derive(PartialEq)]
enum Direction {
Up,
Down,
}
fn move_selection<T: Clone + Send + 'static>(
ui: &Rc<UiElements<T>>,
meta: &Rc<MetaData<T>>,
direction: &Direction,
) -> Propagation {
if !meta.config.read().unwrap().rollover() {
return Propagation::Proceed;
}
let selected_children = ui.main_box.selected_children();
let Some(selected) = selected_children.first() else {
return Propagation::Proceed;
@ -1131,7 +1145,7 @@ fn move_selection<T: Clone + Send + 'static>(ui: &Rc<UiElements<T>>, up: bool) -
return Propagation::Proceed;
};
if up && first_child == *selected {
if *direction == Direction::Up && first_child == *selected {
select_visible_child(
&ui.menu_rows.read().unwrap(),
&ui.main_box,
@ -1139,7 +1153,7 @@ fn move_selection<T: Clone + Send + 'static>(ui: &Rc<UiElements<T>>, up: bool) -
&ChildPosition::Back,
);
Propagation::Stop
} else if !up && last_child == *selected {
} else if *direction == Direction::Down && last_child == *selected {
select_visible_child(
&ui.menu_rows.read().unwrap(),
&ui.main_box,