Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 4c3420f3f6 into a102b08743

Browse source
This commit is contained in:
Rafał Krzyważnia 2025-08-25 12:22:18 -04:00 • committed by GitHub
commit 366e8051aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/workspace/src/workspace.rs
View file

@ -2924,10 +2924,6 @@ impl Workspace {
}
});
if reveal_dock {
self.dismiss_zoomed_items_to_reveal(Some(dock_side), window, cx);
}
if focus_center {
self.active_pane
.update(cx, |pane, cx| window.focus(&pane.focus_handle(cx)))
@ -3829,14 +3825,19 @@ impl Workspace {
self.last_active_center_pane = Some(pane.downgrade());
}
self.dismiss_zoomed_items_to_reveal(None, window, cx);
// Handle zoom state changes
if pane.read(cx).is_zoomed() {
// This pane is zoomed, dismiss other zoomed items
self.dismiss_zoomed_items_to_reveal(None, window, cx);
self.zoomed = Some(pane.downgrade().into());
} else {
self.zoomed_position = None;
cx.emit(Event::ZoomChanged);
} else {
// No zoomed items
self.zoomed = None;
self.zoomed_position = None;
}
self.zoomed_position = None;
cx.emit(Event::ZoomChanged);
self.update_active_view_for_followers(window, cx);
pane.update(cx, |pane, _| {
pane.track_alternate_file_items();