Merge branch 'master' into new-tab-current-dir-with-config
This commit is contained in:
commit
f5e21f2c98
1 changed files with 13 additions and 1 deletions
14
src/main.rs
14
src/main.rs
|
|
@ -597,6 +597,18 @@ impl App {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn reset_active_pane_zoom(&mut self) {
|
||||||
|
if let Some(tab_model) = self.pane_model.active() {
|
||||||
|
for entity in tab_model.iter() {
|
||||||
|
if tab_model.is_active(entity)
|
||||||
|
&& let Some(terminal) = tab_model.data::<Mutex<Terminal>>(entity)
|
||||||
|
{
|
||||||
|
terminal.lock().unwrap().set_zoom_adj(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn save_shortcuts_custom(&mut self) {
|
fn save_shortcuts_custom(&mut self) {
|
||||||
self.config.shortcuts_custom = self.shortcuts_config.custom.clone();
|
self.config.shortcuts_custom = self.shortcuts_config.custom.clone();
|
||||||
match &self.config_handler {
|
match &self.config_handler {
|
||||||
|
|
@ -3239,7 +3251,7 @@ impl Application for App {
|
||||||
return self.update_render_active_pane_zoom(message);
|
return self.update_render_active_pane_zoom(message);
|
||||||
}
|
}
|
||||||
Message::ZoomReset => {
|
Message::ZoomReset => {
|
||||||
self.reset_terminal_panes_zoom();
|
self.reset_active_pane_zoom();
|
||||||
return self.update_config();
|
return self.update_config();
|
||||||
}
|
}
|
||||||
Message::ContextMenuPopupClosed(id) => {
|
Message::ContextMenuPopupClosed(id) => {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue