mitsuo_makuda/linutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/linutil.git synced 2024-11-22 05:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow selection of search bar

Browse Source
This commit is contained in:
nnyyxxxx 2024-11-12 23:51:39 -05:00
parent f6b8358fcc
commit 093ae2cfb3
No known key found for this signature in database
GPG Key ID: 6038FFD6589902CB
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tui/src/state.rs
View File

@ -495,14 +495,31 @@ impl AppState {
return true; return true;
} }
if matches!(self.focus, Focus::TabList | Focus::List) { if matches!(self.focus, Focus::TabList | Focus::List | Focus::Search) {
let position = Position::new(event.column, event.row); let position = Position::new(event.column, event.row);
let mouse_in_tab_list = self.areas.as_ref().unwrap().tab_list.contains(position); let mouse_in_tab_list = self.areas.as_ref().unwrap().tab_list.contains(position);
let mouse_in_list = self.areas.as_ref().unwrap().list.contains(position); let mouse_in_list = self.areas.as_ref().unwrap().list.contains(position);
let mouse_in_search = if let Some(areas) = &self.areas {
position.y >= areas.list.y
&& position.y < areas.list.y + 3
&& position.x >= areas.list.x
&& position.x < areas.list.x + areas.list.width
} else {
false
};
match event.kind { match event.kind {
MouseEventKind::Moved => { MouseEventKind::Moved => {
if mouse_in_list { if mouse_in_search {
if !matches!(self.focus, Focus::Search) {
self.focus = Focus::Search;
self.filter.activate_search();
}
} else if mouse_in_list {
if matches!(self.focus, Focus::Search) {
self.exit_search();
}
self.focus = Focus::List; self.focus = Focus::List;
if let Some(areas) = &self.areas { if let Some(areas) = &self.areas {
let list_start = areas.list.y + 4; let list_start = areas.list.y + 4;
@ -518,6 +535,9 @@ impl AppState {
} }
} }
} else if mouse_in_tab_list { } else if mouse_in_tab_list {
if matches!(self.focus, Focus::Search) {
self.exit_search();
}
self.focus = Focus::TabList; self.focus = Focus::TabList;
if let Some(areas) = &self.areas { if let Some(areas) = &self.areas {
let relative_y = position.y.saturating_sub(areas.tab_list.y + 1); let relative_y = position.y.saturating_sub(areas.tab_list.y + 1);
@ -529,30 +549,35 @@ impl AppState {
} }
} }
MouseEventKind::Down(MouseButton::Left) => { MouseEventKind::Down(MouseButton::Left) => {
if mouse_in_list { if mouse_in_search {
self.enter_search();
} else if mouse_in_list {
if matches!(self.focus, Focus::Search) {
self.exit_search();
}
self.handle_enter(); self.handle_enter();
} else if mouse_in_tab_list { } else if mouse_in_tab_list {
if matches!(self.focus, Focus::Search) {
self.exit_search();
}
self.focus = Focus::List; self.focus = Focus::List;
} }
} }
MouseEventKind::ScrollDown => { MouseEventKind::ScrollDown | MouseEventKind::ScrollUp => {
if matches!(self.focus, Focus::Search) {
self.exit_search();
}
if mouse_in_tab_list { if mouse_in_tab_list {
if self.current_tab.selected().unwrap() != self.tabs.len() - 1 { if self.current_tab.selected().unwrap() != self.tabs.len() - 1 {
self.current_tab.select_next(); self.current_tab.select_next();
} }
self.refresh_tab(); self.refresh_tab();
} else if mouse_in_list { } else if mouse_in_list {
self.scroll_down(); if event.kind == MouseEventKind::ScrollDown {
} self.scroll_down();
} } else {
MouseEventKind::ScrollUp => { self.scroll_up();
if mouse_in_tab_list {
if self.current_tab.selected().unwrap() != 0 {
self.current_tab.select_previous();
} }
self.refresh_tab();
} else if mouse_in_list {
self.scroll_up();
} }
} }
_ => {} _ => {}