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

Add a way to join all panes into one (#17673)

Browse source 
Closes https://github.com/zed-industries/zed/issues/17536
Closes https://github.com/zed-industries/zed/pull/17548


Release Notes:

- Added a way to join all panes into one with `pane::JoinAll` action
([#17536](https://github.com/zed-industries/zed/issues/17536))

---------

Co-authored-by: Yogesh Dhamija <ydhamija96@gmail.com>
This commit is contained in:
Kirill Bulatov 2024-09-10 23:58:57 -04:00 • committed by GitHub
parent 331d28d479
commit ec189fe884
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 173 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/workspace/src/pane.rs
View file

@ -3,6 +3,7 @@ use crate::{
ClosePosition, Item, ItemHandle, ItemSettings, PreviewTabsSettings, TabContentParams,
WeakItemHandle,
},
move_item,
notifications::NotifyResultExt,
toolbar::Toolbar,
workspace_settings::{AutosaveSetting, TabBarSettings, WorkspaceSettings},
@ -149,6 +150,7 @@ actions!(
GoBack,
GoForward,
JoinIntoNext,
JoinAll,
ReopenClosedItem,
SplitLeft,
SplitUp,
@ -188,6 +190,7 @@ pub enum Event {
item_id: EntityId,
},
Split(SplitDirection),
JoinAll,
JoinIntoNext,
ChangeItemTitle,
Focus,
@ -220,6 +223,7 @@ impl fmt::Debug for Event {
.debug_struct("Split")
.field("direction", direction)
.finish(),
Event::JoinAll => f.write_str("JoinAll"),
Event::JoinIntoNext => f.write_str("JoinIntoNext"),
Event::ChangeItemTitle => f.write_str("ChangeItemTitle"),
Event::Focus => f.write_str("Focus"),
@ -679,6 +683,10 @@ impl Pane {
cx.emit(Event::JoinIntoNext);
}
fn join_all(&mut self, cx: &mut ViewContext<Self>) {
cx.emit(Event::JoinAll);
}
fn history_updated(&mut self, cx: &mut ViewContext<Self>) {
self.toolbar.update(cx, |_, cx| cx.notify());
}
@ -1757,9 +1765,7 @@ impl Pane {
self.workspace
.update(cx, |_, cx| {
cx.defer(move |this, cx| {
this.move_item(pane.clone(), pane, id, destination_index, cx)
});
cx.defer(move |_, cx| move_item(&pane, &pane, id, destination_index, cx));
})
.ok()?;
@ -1777,9 +1783,7 @@ impl Pane {
self.workspace
.update(cx, |_, cx| {
cx.defer(move |this, cx| {
this.move_item(pane.clone(), pane, id, destination_index, cx)
});
cx.defer(move |_, cx| move_item(&pane, &pane, id, destination_index, cx));
})
.ok()?;
@ -2349,7 +2353,7 @@ impl Pane {
}
})
}
workspace.move_item(from_pane.clone(), to_pane.clone(), item_id, ix, cx);
move_item(&from_pane, &to_pane, item_id, ix, cx);
});
})
.log_err();
@ -2556,6 +2560,7 @@ impl Render for Pane {
.on_action(cx.listener(|pane, _: &GoBack, cx| pane.navigate_backward(cx)))
.on_action(cx.listener(|pane, _: &GoForward, cx| pane.navigate_forward(cx)))
.on_action(cx.listener(|pane, _: &JoinIntoNext, cx| pane.join_into_next(cx)))
.on_action(cx.listener(|pane, _: &JoinAll, cx| pane.join_all(cx)))
.on_action(cx.listener(Pane::toggle_zoom))
.on_action(cx.listener(|pane: &mut Pane, action: &ActivateItem, cx| {
pane.activate_item(action.0, true, true, cx);