tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-27 07:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature: Allow Ctrl-F and / to work in sort (#212)

Browse Source 
Fixes a bug, and also allows `Ctrl-F` and `/` to work in the sort widget.
This commit is contained in:
Clement Tsang 2020-08-29 19:23:20 -04:00 committed by GitHub
parent 3d2fc76aa2
commit 6632714f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/app.rs
View File

@ -287,20 +287,25 @@ impl App {
pub fn on_slash(&mut self) { pub fn on_slash(&mut self) {
if !self.is_in_dialog() { if !self.is_in_dialog() {
// FIXME: Add ProcSort too, it's annoying match &self.current_widget.widget_type {
if let BottomWidgetType::Proc = self.current_widget.widget_type { BottomWidgetType::Proc | BottomWidgetType::ProcSort => {
// Toggle on // Toggle on
if let Some(proc_widget_state) = self if let Some(proc_widget_state) = self.proc_state.get_mut_widget_state(
.proc_state self.current_widget.widget_id
.get_mut_widget_state(self.current_widget.widget_id) - match &self.current_widget.widget_type {
{ BottomWidgetType::ProcSort => 2,
proc_widget_state _ => 0,
.process_search_state },
.search_state ) {
.is_enabled = true; proc_widget_state
self.move_widget_selection(&WidgetDirection::Down); .process_search_state
self.is_force_redraw = true; .search_state
.is_enabled = true;
self.move_widget_selection(&WidgetDirection::Down);
self.is_force_redraw = true;
}
} }
_ => {}
} }
} }
} }
@ -328,8 +333,10 @@ impl App {
.set_to_sorted_index(&proc_widget_state.process_sorting_type); .set_to_sorted_index(&proc_widget_state.process_sorting_type);
self.move_widget_selection(&WidgetDirection::Left); self.move_widget_selection(&WidgetDirection::Left);
} else { } else {
// Otherwise, move right // Otherwise, move right if currently on the sort widget
self.move_widget_selection(&WidgetDirection::Right); if let BottomWidgetType::ProcSort = self.current_widget.widget_type {
self.move_widget_selection(&WidgetDirection::Right);
}
} }
} }

1
src/canvas/widgets/battery_display.rs
View File

@ -198,6 +198,7 @@ impl BatteryDisplayWidget for Painter {
// .map(|battery| Spans::from(battery.battery_name.clone()))) // .map(|battery| Spans::from(battery.battery_name.clone())))
// .collect::<Vec<_>>(), // .collect::<Vec<_>>(),
// ) // )
// FIXME: [MOUSE] Support mouse for the tabs?
Tabs::default() Tabs::default()
.titles( .titles(
app_state app_state