filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buffer movement is now working as I would only wish it would. Needs layers implementation, will do in the future

Browse Source
This commit is contained in:
filipriec
2025-04-15 00:10:28 +02:00
parent aa8887318f
commit 779683de4b
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/handlers/buffer_list.rs
View File

@@ -48,7 +48,7 @@ pub fn render_buffer_list(
let mut current_width = 0; let mut current_width = 0;
for (i, view) in history.iter().enumerate() { for (i, view) in history.iter().enumerate() {
let is_active = i == history_len - 1; let is_active = i == app_state.ui.active_buffer_index;
let buffer_name = view.display_name(); let buffer_name = view.display_name();
let buffer_text = format!(" {} ", buffer_name); let buffer_text = format!(" {} ", buffer_name);
let text_width = UnicodeWidthStr::width(buffer_text.as_str()); let text_width = UnicodeWidthStr::width(buffer_text.as_str());
@@ -60,6 +60,7 @@ pub fn render_buffer_list(
} }
if i > 0 { if i > 0 {
let prev_is_active = i - 1 == app_state.ui.active_buffer_index;
let sep_style = if is_active { let sep_style = if is_active {
separator_style_inactive_to_active separator_style_inactive_to_active
} else { } else {
@@ -73,6 +74,7 @@ pub fn render_buffer_list(
spans.push(Span::styled(buffer_text, text_style)); spans.push(Span::styled(buffer_text, text_style));
current_width += text_width; current_width += text_width;
let next_is_active = i + 1 < history_len && i + 1 == app_state.ui.active_buffer_index;
let sep_style = if is_active { let sep_style = if is_active {
separator_style_active_to_inactive separator_style_active_to_inactive
} else { } else {

16
client/src/state/app/state.rs
View File

@@ -49,6 +49,7 @@ pub struct UiState {
pub show_register: bool, pub show_register: bool,
pub focus_outside_canvas: bool, pub focus_outside_canvas: bool,
pub buffer_history: Vec<AppView>, pub buffer_history: Vec<AppView>,
pub active_buffer_index: usize,
pub dialog: DialogState, pub dialog: DialogState,
} }
@@ -166,6 +167,7 @@ impl Default for UiState {
show_buffer_list: false, show_buffer_list: false,
focus_outside_canvas: false, focus_outside_canvas: false,
buffer_history: vec![AppView::Intro], buffer_history: vec![AppView::Intro],
active_buffer_index: 0,
dialog: DialogState::default(), dialog: DialogState::default(),
} }
} }
@@ -186,10 +188,18 @@ impl Default for DialogState {
} }
impl UiState { impl UiState {
/// Adds the given view to the history if it's different from the last one. /// Updates the buffer history and active index.
pub fn update_buffer_history(&mut self, view: AppView) { pub fn update_buffer_history(&mut self, view: AppView) {
if self.buffer_history.last() != Some(&view) { let existing_pos = self.buffer_history.iter().position(|v| v == &view);
self.buffer_history.push(view.clone());
match existing_pos {
Some(pos) => {
self.active_buffer_index = pos;
}
None => {
self.buffer_history.push(view.clone());
self.active_buffer_index = self.buffer_history.len() - 1;
}
} }
} }
} }