diff options
| author | denis <denismaximov98@gmail.com> | 2021-05-01 13:45:01 +0300 |
|---|---|---|
| committer | denis <denismaximov98@gmail.com> | 2021-05-01 13:45:01 +0300 |
| commit | eabecde90b1617ce4c29be9d5af3f52ccb67e45f (patch) | |
| tree | 0d0dafa594269045f084383a9719f2a4995fe7ea /src/common/screen.rs | |
| parent | wip: more cleaning up (diff) | |
| parent | docs(changelog): performance improvements (diff) | |
| download | sl0ppij-eabecde90b1617ce4c29be9d5af3f52ccb67e45f.tar.gz sl0ppij-eabecde90b1617ce4c29be9d5af3f52ccb67e45f.tar.xz sl0ppij-eabecde90b1617ce4c29be9d5af3f52ccb67e45f.zip | |
chore: painless merge this time
Diffstat (limited to 'src/common/screen.rs')
| -rw-r--r-- | src/common/screen.rs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/common/screen.rs b/src/common/screen.rs index 03cfa0bf..e6cf73f5 100644 --- a/src/common/screen.rs +++ b/src/common/screen.rs @@ -51,6 +51,7 @@ pub enum ScreenInstruction { NewTab(RawFd), SwitchTabNext, SwitchTabPrev, + ToggleActiveSyncPanes, CloseTab, GoToTab(u32), UpdateTabName(Vec<u8>), @@ -158,8 +159,9 @@ impl Screen { let active_tab_pos = self.get_active_tab().unwrap().position; let new_tab_pos = (active_tab_pos + 1) % self.tabs.len(); - for tab in self.tabs.values() { + for tab in self.tabs.values_mut() { if tab.position == new_tab_pos { + tab.set_force_render(); self.active_tab_index = Some(tab.index); break; } @@ -176,8 +178,9 @@ impl Screen { } else { active_tab_pos - 1 }; - for tab in self.tabs.values() { + for tab in self.tabs.values_mut() { if tab.position == new_tab_pos { + tab.set_force_render(); self.active_tab_index = Some(tab.index); break; } @@ -188,9 +191,10 @@ impl Screen { pub fn go_to_tab(&mut self, mut tab_index: usize) { tab_index -= 1; - let active_tab = self.get_active_tab().unwrap(); - if let Some(t) = self.tabs.values().find(|t| t.position == tab_index) { - if t.index != active_tab.index { + let active_tab_index = self.get_active_tab().unwrap().index; + if let Some(t) = self.tabs.values_mut().find(|t| t.position == tab_index) { + if t.index != active_tab_index { + t.set_force_render(); self.active_tab_index = Some(t.index); self.update_tabs(); self.render(); @@ -234,6 +238,7 @@ impl Screen { for (_, tab) in self.tabs.iter_mut() { tab.resize_whole_tab(new_screen_size); } + let _ = self.get_active_tab_mut().map(|t| t.set_force_render()); self.render(); } @@ -295,7 +300,7 @@ impl Screen { self.update_tabs(); } - fn update_tabs(&self) { + pub fn update_tabs(&self) { let mut tab_data = vec![]; let active_tab_index = self.active_tab_index.unwrap(); for tab in self.tabs.values() { @@ -303,6 +308,7 @@ impl Screen { position: tab.position, name: tab.name.clone(), active: active_tab_index == tab.index, + is_sync_panes_active: tab.is_sync_panes_active(), }); } self.send_plugin_instructions |
