Merge pull request #25 from RivoLink/chore/improve-status-bar-shortcuts

+5 -4

README.md

··· 112 112 | `g` / Home | Top | 113 113 | `G` / End | Bottom | 114 114 | `t` | Toggle TOC sidebar | 115 - | `T` | Open theme picker | 115 + | `Shift+T` | Open theme picker | 116 + | `Shift+E` | Open editor picker | 117 + | `Ctrl+E` | Open in editor | 118 + | `Ctrl+F` / `/` | Find | 119 + | `n` / `N` | Next / prev match | 116 120 | `?` | Show help popup | 117 - | `1`–`9` | Jump to TOC section N | 118 - | `/` / `Ctrl+F` | Search | 119 - | `n` / `N` | Next / prev match | 120 121 | `r` | Force reload (watch mode) | 121 122 | `q` | Quit | 122 123

+4

src/app/mod.rs

··· 65 65 watch: bool, 66 66 flash_active: bool, 67 67 editor_flash_active: bool, 68 + file_picker_open: bool, 69 + picker_loading: bool, 68 70 } 69 71 70 72 pub(crate) struct AppConfig { ··· 385 387 .as_ref() 386 388 .map(|(_, t)| t.elapsed() < Duration::from_millis(2000)) 387 389 .unwrap_or(false), 390 + file_picker_open: self.is_file_picker_open(), 391 + picker_loading: self.is_picker_loading(), 388 392 }; 389 393 390 394 if self.status_cache_key.as_ref() == Some(&cache_key) {

+82 -52

src/render/modal.rs

················································

+9 -33

src/render/status.rs

··· 117 117 pub(crate) fn status_hint_segments(app: &App) -> &'static [&'static str] { 118 118 if app.is_search_mode() { 119 119 &["enter confirm", "esc cancel"] 120 - } else if app.is_file_picker_open() { 121 - if app.is_fuzzy_file_picker() { 122 - &["↑/↓ move", "enter open", "backspace delete", "ctrl+c quit"] 123 - } else { 124 - &["j/k move", "enter open", "backspace up", "ctrl+c quit"] 125 - } 126 - } else if app.is_theme_picker_open() { 127 - &["j/k preview", "enter keep", "esc restore"] 128 - } else if app.is_help_open() { 129 - &["esc close", "? close"] 130 120 } else if app.has_active_search() { 131 - &[ 132 - "enter next", 133 - "n/N next/prev", 134 - "/ search", 135 - "? help", 136 - "T theme", 137 - "esc clear", 138 - "q quit", 139 - ] 121 + &["n/N next/prev", "esc cancel"] 140 122 } else { 141 - &[ 142 - "j/k scroll", 143 - "g/G top/bot", 144 - "t toc", 145 - "T theme", 146 - "/ search", 147 - "? help", 148 - "n/N next/prev", 149 - "q quit", 150 - ] 123 + &["ctrl+e edit", "ctrl+f find", "t toc", "? help", "q quit"] 151 124 } 152 125 } 153 126 ··· 158 131 .iter() 159 132 .map(|segment| { 160 133 vec![Span::styled( 161 - (*segment).to_string(), 134 + *segment, 162 135 Style::default().fg(theme.ui.status_shortcut_fg).bg(bar_bg), 163 136 )] 164 137 }) ··· 215 188 left_section.extend(section); 216 189 } 217 190 218 - if let Some(section) = status_watch_section(app) { 219 - left_section.extend(section); 191 + let file_open = !app.is_file_picker_open() && !app.is_picker_loading(); 192 + if file_open { 193 + if let Some(section) = status_watch_section(app) { 194 + left_section.extend(section); 195 + } 220 196 } 221 197 222 198 let mut sections = vec![left_section, status_shortcuts_section(app, bar_bg)]; 223 - if !app.is_file_picker_open() && !app.is_picker_loading() { 199 + if file_open { 224 200 sections.push(status_percent_section(pct, bar_bg)); 225 201 } 226 202

+21 -10

src/runtime.rs

··· 144 144 if app.is_help_open() { 145 145 match key.code { 146 146 KeyCode::Esc | KeyCode::Char('?') => app.close_help(), 147 + KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => { 148 + app.close_help(); 149 + } 147 150 _ => state_changed = false, 148 151 } 149 152 } else if app.is_picker_loading() { 150 153 match key.code { 154 + KeyCode::Char('q') => break, 151 155 KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => { 152 156 break; 153 157 } ··· 155 159 } 156 160 } else if app.is_picker_load_failed() { 157 161 match key.code { 158 - KeyCode::Esc | KeyCode::Enter => break, 162 + KeyCode::Esc | KeyCode::Enter | KeyCode::Char('q') => break, 159 163 KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => { 160 164 break; 161 165 } ··· 179 183 } 180 184 KeyCode::Up if app.is_fuzzy_file_picker() => app.move_file_picker_up(), 181 185 KeyCode::Esc => { 182 - if app.is_browser_file_picker() 183 - || app.file_picker_query().is_empty() 184 - { 186 + if app.is_browser_file_picker() { 187 + state_changed = app.open_file_picker_parent(); 188 + } else if app.file_picker_query().is_empty() { 185 189 state_changed = false; 186 190 } else { 187 191 app.clear_file_picker_query(); ··· 206 210 _ => state_changed = false, 207 211 } 208 212 } else if app.is_theme_picker_open() { 213 + let dismiss = matches!(key.code, KeyCode::Esc | KeyCode::Char('T')) 214 + || (key.code == KeyCode::Char('c') 215 + && key.modifiers.contains(KeyModifiers::CONTROL)); 216 + if dismiss { 217 + app.restore_theme_picker_preview(ss, themes); 218 + needs_redraw = true; 219 + state_changed = false; 220 + } 209 221 match key.code { 210 - KeyCode::Esc => { 211 - app.restore_theme_picker_preview(ss, themes); 212 - needs_redraw = true; 213 - state_changed = false; 214 - } 222 + _ if dismiss => {} 215 223 KeyCode::Enter => app.close_theme_picker(), 216 224 KeyCode::Char('j') | KeyCode::Down => { 217 225 app.move_theme_picker_down(); ··· 236 244 } 237 245 } else if app.is_editor_picker_open() { 238 246 match key.code { 239 - KeyCode::Esc => app.cancel_editor_picker(), 247 + KeyCode::Esc | KeyCode::Char('E') => app.cancel_editor_picker(), 248 + KeyCode::Char('c') if key.modifiers.contains(KeyModifiers::CONTROL) => { 249 + app.cancel_editor_picker(); 250 + } 240 251 KeyCode::Enter => app.close_editor_picker(), 241 252 KeyCode::Char('j') | KeyCode::Down => app.move_editor_picker_down(), 242 253 KeyCode::Char('k') | KeyCode::Up => app.move_editor_picker_up(),

Configure Feed

Configure Feed