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

Added a very basic way of displaying your current search mode... I need to refine this over the next few days.

Browse Source
This commit is contained in:
ClementTsang 2020-01-15 23:03:23 -05:00
parent a4badebd73
commit cc5c6f4d87
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/canvas.rs
View File

@ -900,7 +900,7 @@ fn draw_disk_table<B: backend::Backend>(
fn draw_search_field<B: backend::Backend>( fn draw_search_field<B: backend::Backend>(
f: &mut Frame<B>, app_state: &mut app::App, draw_loc: Rect, f: &mut Frame<B>, app_state: &mut app::App, draw_loc: Rect,
) { ) {
let width = draw_loc.width - 10; let width = draw_loc.width - 18; // TODO [SEARCH] this is hardcoded... ew
let query = app_state.get_current_search_query(); let query = app_state.get_current_search_query();
let shrunk_query = if query.len() < width as usize { let shrunk_query = if query.len() < width as usize {
query query
@ -910,16 +910,22 @@ fn draw_search_field<B: backend::Backend>(
let search_text = [ let search_text = [
if app_state.is_searching_with_pid() { if app_state.is_searching_with_pid() {
Text::styled("\nPID : ", Style::default().fg(TABLE_HEADER_COLOUR)) Text::styled("\nPID", Style::default().fg(TABLE_HEADER_COLOUR))
} else { } else {
Text::styled("\nName: ", Style::default().fg(TABLE_HEADER_COLOUR)) Text::styled("\nName", Style::default().fg(TABLE_HEADER_COLOUR))
},
if app_state.use_simple {
Text::styled(" (Simple): ", Style::default().fg(TABLE_HEADER_COLOUR))
} else {
Text::styled(" (Regex): ", Style::default().fg(TABLE_HEADER_COLOUR))
}, },
Text::raw(shrunk_query), Text::raw(shrunk_query),
]; ];
// TODO: [SEARCH] Gotta make this easier to understand... it's pretty ugly cramming controls like this
Paragraph::new(search_text.iter()) Paragraph::new(search_text.iter())
.block( .block(
Block::default() Block::default()
.title("Search (Ctrl-p and Ctrl-n to switch search types, Esc or Ctrl-f to close, Enter to search)") .title("Search (Esc or Ctrl-f to close)")
.borders(Borders::ALL) .borders(Borders::ALL)
.border_style(if app_state.get_current_regex_matcher().is_err() { .border_style(if app_state.get_current_regex_matcher().is_err() {
Style::default().fg(Color::Red) Style::default().fg(Color::Red)