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

Implement "join pane into next" (#16077)

Browse source 
Closes #12409

Release Notes:

- Added "join pane into next" action ([#12409](https://github.com/zed-industries/zed/issues/12409))


https://github.com/zed-industries/zed/assets/727422/00cc8599-e5d6-4fb8-9f0d-9b232d2210ef

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
This commit is contained in:
Toni Cárdenas 2024-08-26 23:51:51 +02:00 • committed by GitHub
parent f417893a7b
commit b99bf92452
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 238 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -147,6 +147,7 @@ actions!(
CloseItemsToTheRight,
GoBack,
GoForward,
JoinIntoNext,
ReopenClosedItem,
SplitLeft,
SplitUp,
@ -175,7 +176,9 @@ pub enum Event {
ActivateItem {
local: bool,
},
Remove,
Remove {
focus_on_pane: Option<View<Pane>>,
},
RemoveItem {
idx: usize,
},
@ -183,6 +186,7 @@ pub enum Event {
item_id: EntityId,
},
Split(SplitDirection),
JoinIntoNext,
ChangeItemTitle,
Focus,
ZoomIn,
@ -204,7 +208,7 @@ impl fmt::Debug for Event {
.debug_struct("ActivateItem")
.field("local", local)
.finish(),
Event::Remove => f.write_str("Remove"),
Event::Remove { .. } => f.write_str("Remove"),
Event::RemoveItem { idx } => f.debug_struct("RemoveItem").field("idx", idx).finish(),
Event::RemovedItem { item_id } => f
.debug_struct("RemovedItem")
@ -214,6 +218,7 @@ impl fmt::Debug for Event {
.debug_struct("Split")
.field("direction", direction)
.finish(),
Event::JoinIntoNext => f.write_str("JoinIntoNext"),
Event::ChangeItemTitle => f.write_str("ChangeItemTitle"),
Event::Focus => f.write_str("Focus"),
Event::ZoomIn => f.write_str("ZoomIn"),
@ -668,6 +673,10 @@ impl Pane {
}
}
fn join_into_next(&mut self, cx: &mut ViewContext<Self>) {
cx.emit(Event::JoinIntoNext);
}
fn history_updated(&mut self, cx: &mut ViewContext<Self>) {
self.toolbar.update(cx, |_, cx| cx.notify());
}
@ -1318,6 +1327,33 @@ impl Pane {
activate_pane: bool,
close_pane_if_empty: bool,
cx: &mut ViewContext<Self>,
) {
self._remove_item(item_index, activate_pane, close_pane_if_empty, None, cx)
}
pub fn remove_item_and_focus_on_pane(
&mut self,
item_index: usize,
activate_pane: bool,
focus_on_pane_if_closed: View<Pane>,
cx: &mut ViewContext<Self>,
) {
self._remove_item(
item_index,
activate_pane,
true,
Some(focus_on_pane_if_closed),
cx,
)
}
fn _remove_item(
&mut self,
item_index: usize,
activate_pane: bool,
close_pane_if_empty: bool,
focus_on_pane_if_closed: Option<View<Pane>>,
cx: &mut ViewContext<Self>,
) {
self.activation_history
.retain(|entry| entry.entity_id != self.items[item_index].item_id());
@ -1354,7 +1390,9 @@ impl Pane {
item.deactivated(cx);
if close_pane_if_empty {
self.update_toolbar(cx);
cx.emit(Event::Remove);
cx.emit(Event::Remove {
focus_on_pane: focus_on_pane_if_closed,
});
}
}
@ -2259,6 +2297,7 @@ impl Render for Pane {
.on_action(cx.listener(|pane, _: &SplitDown, cx| pane.split(SplitDirection::Down, cx)))
.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::toggle_zoom))
.on_action(cx.listener(|pane: &mut Pane, action: &ActivateItem, cx| {
pane.activate_item(action.0, true, true, cx);