diff options
Diffstat (limited to 'src/options.rs')
| -rw-r--r-- | src/options.rs | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/src/options.rs b/src/options.rs index 0e33570e..1ad78c83 100644 --- a/src/options.rs +++ b/src/options.rs @@ -10,7 +10,11 @@ use std::{ }; use crate::{ - app::{layout_manager::*, *}, + app::{ + layout_manager::*, + widgets::{ProcWidget, ProcWidgetMode}, + *, + }, canvas::ColourScheme, constants::*, units::data_units::DataUnit, @@ -265,7 +269,7 @@ pub fn build_app( let mut cpu_state_map: HashMap<u64, CpuWidgetState> = HashMap::new(); let mut mem_state_map: HashMap<u64, MemWidgetState> = HashMap::new(); let mut net_state_map: HashMap<u64, NetWidgetState> = HashMap::new(); - let mut proc_state_map: HashMap<u64, ProcWidgetState> = HashMap::new(); + let mut proc_state_map: HashMap<u64, ProcWidget> = HashMap::new(); let mut temp_state_map: HashMap<u64, TempWidgetState> = HashMap::new(); let mut disk_state_map: HashMap<u64, DiskWidgetState> = HashMap::new(); let mut battery_state_map: HashMap<u64, BatteryWidgetState> = HashMap::new(); @@ -353,15 +357,22 @@ pub fn build_app( ); } Proc => { + let mode = if is_grouped { + ProcWidgetMode::Grouped + } else if is_default_tree { + ProcWidgetMode::Tree + } else { + ProcWidgetMode::Normal + }; + proc_state_map.insert( widget.widget_id, - ProcWidgetState::init( + ProcWidget::init( + mode, is_case_sensitive, is_match_whole_word, is_use_regex, - is_grouped, show_memory_as_values, - is_default_tree, is_default_command, ), ); @@ -466,7 +477,7 @@ pub fn build_app( let mapping = HashMap::new(); for widget in search_case_enabled_widgets { if let Some(proc_widget) = proc_state_map.get_mut(&widget.id) { - proc_widget.process_search_state.is_ignoring_case = !widget.enabled; + proc_widget.search_state.is_ignoring_case = !widget.enabled; } } flags.search_case_enabled_widgets_map = Some(mapping); @@ -480,7 +491,7 @@ pub fn build_app( let mapping = HashMap::new(); for widget in search_whole_word_enabled_widgets { if let Some(proc_widget) = proc_state_map.get_mut(&widget.id) { - proc_widget.process_search_state.is_searching_whole_word = widget.enabled; + proc_widget.search_state.is_searching_whole_word = widget.enabled; } } flags.search_whole_word_enabled_widgets_map = Some(mapping); @@ -492,7 +503,7 @@ pub fn build_app( let mapping = HashMap::new(); for widget in search_regex_enabled_widgets { if let Some(proc_widget) = proc_state_map.get_mut(&widget.id) { - proc_widget.process_search_state.is_searching_with_regex = widget.enabled; + proc_widget.search_state.is_searching_with_regex = widget.enabled; } } flags.search_regex_enabled_widgets_map = Some(mapping); |