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

Seperate open and zoom bits conceptually for new panels

Browse source 
co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-05-30 11:52:14 -07:00
parent 1fc9103b61
commit 84f98f13c4
No known key found for this signature in database
2 changed files with 131 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/workspace/src/dock.rs
View file

@ -180,7 +180,7 @@ impl Dock {
} }
pub fn has_focus(&self, cx: &WindowContext) -> bool { pub fn has_focus(&self, cx: &WindowContext) -> bool {
self.active_panel() self.visible_panel()
.map_or(false, |panel| panel.has_focus(cx)) .map_or(false, |panel| panel.has_focus(cx))
} }
@ -259,7 +259,7 @@ impl Dock {
cx.focus(&panel); cx.focus(&panel);
} }
} else if T::should_close_on_event(event) } else if T::should_close_on_event(event)
&& this.active_panel().map_or(false, |p| p.id() == panel.id()) && this.visible_panel().map_or(false, |p| p.id() == panel.id())
{ {
this.set_open(false, cx); this.set_open(false, cx);
} }
@ -315,12 +315,16 @@ impl Dock {
} }
} }
pub fn active_panel(&self) -> Option<&Rc<dyn PanelHandle>> { pub fn visible_panel(&self) -> Option<&Rc<dyn PanelHandle>> {
let entry = self.active_entry()?; let entry = self.visible_entry()?;
Some(&entry.panel) Some(&entry.panel)
} }
fn active_entry(&self) -> Option<&PanelEntry> { pub fn active_panel(&self) -> Option<&Rc<dyn PanelHandle>> {
Some(&self.panel_entries.get(self.active_panel_index)?.panel)
}
fn visible_entry(&self) -> Option<&PanelEntry> {
if self.is_open { if self.is_open {
self.panel_entries.get(self.active_panel_index) self.panel_entries.get(self.active_panel_index)
} else { } else {
@ -329,7 +333,7 @@ impl Dock {
} }
pub fn zoomed_panel(&self, cx: &WindowContext) -> Option<Rc<dyn PanelHandle>> { pub fn zoomed_panel(&self, cx: &WindowContext) -> Option<Rc<dyn PanelHandle>> {
let entry = self.active_entry()?; let entry = self.visible_entry()?;
if entry.panel.is_zoomed(cx) { if entry.panel.is_zoomed(cx) {
Some(entry.panel.clone()) Some(entry.panel.clone())
} else { } else {
@ -362,7 +366,7 @@ impl Dock {
} }
pub fn render_placeholder(&self, cx: &WindowContext) -> AnyElement<Workspace> { pub fn render_placeholder(&self, cx: &WindowContext) -> AnyElement<Workspace> {
if let Some(active_entry) = self.active_entry() { if let Some(active_entry) = self.visible_entry() {
Empty::new() Empty::new()
.into_any() .into_any()
.contained() .contained()
@ -399,7 +403,7 @@ impl View for Dock {
} }
fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> { fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
if let Some(active_entry) = self.active_entry() { if let Some(active_entry) = self.visible_entry() {
let style = self.style(cx); let style = self.style(cx);
ChildView::new(active_entry.panel.as_any(), cx) ChildView::new(active_entry.panel.as_any(), cx)
.contained() .contained()
@ -417,7 +421,7 @@ impl View for Dock {
fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) { fn focus_in(&mut self, _: AnyViewHandle, cx: &mut ViewContext<Self>) {
if cx.is_self_focused() { if cx.is_self_focused() {
if let Some(active_entry) = self.active_entry() { if let Some(active_entry) = self.visible_entry() {
cx.focus(active_entry.panel.as_any()); cx.focus(active_entry.panel.as_any());
} else { } else {
cx.focus_parent(); cx.focus_parent();

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

@ -901,7 +901,7 @@ impl Workspace {
was_visible = dock.is_open() was_visible = dock.is_open()
&& dock && dock
.active_panel() .visible_panel()
.map_or(false, |active_panel| active_panel.id() == panel.id()); .map_or(false, |active_panel| active_panel.id() == panel.id());
dock.remove_panel(&panel, cx); dock.remove_panel(&panel, cx);
}); });
@ -1636,7 +1636,7 @@ impl Workspace {
} else { } else {
dock.set_open(true, cx); dock.set_open(true, cx);
dock.activate_panel(panel_index, cx); dock.activate_panel(panel_index, cx);
dock.active_panel().cloned() dock.visible_panel().cloned()
} }
}); });
@ -1658,17 +1658,27 @@ impl Workspace {
pub fn toggle_panel_focus<T: Panel>(&mut self, cx: &mut ViewContext<Self>) { pub fn toggle_panel_focus<T: Panel>(&mut self, cx: &mut ViewContext<Self>) {
for dock in [&self.left_dock, &self.bottom_dock, &self.right_dock] { for dock in [&self.left_dock, &self.bottom_dock, &self.right_dock] {
if let Some(panel_index) = dock.read(cx).panel_index_for_type::<T>() { if let Some(panel_index) = dock.read(cx).panel_index_for_type::<T>() {
let active_item = dock.update(cx, |dock, cx| { let focus_center = dock.update(cx, |dock, cx| {
dock.set_open(true, cx);
dock.activate_panel(panel_index, cx); dock.activate_panel(panel_index, cx);
dock.active_panel().cloned()
}); if let Some(panel) = dock.active_panel().cloned() {
if let Some(active_item) = active_item { if panel.has_focus(cx) {
if active_item.has_focus(cx) { if panel.is_zoomed(cx) {
cx.focus_self(); dock.set_open(false, cx);
}
true
} else {
dock.set_open(true, cx);
cx.focus(panel.as_any());
false
}
} else { } else {
cx.focus(active_item.as_any()); false
} }
});
if focus_center {
cx.focus_self();
} }
self.serialize_workspace(cx); self.serialize_workspace(cx);
@ -2835,7 +2845,7 @@ impl Workspace {
fn build_serialized_docks(this: &Workspace, cx: &AppContext) -> DockStructure { fn build_serialized_docks(this: &Workspace, cx: &AppContext) -> DockStructure {
let left_dock = this.left_dock.read(cx); let left_dock = this.left_dock.read(cx);
let left_visible = left_dock.is_open(); let left_visible = left_dock.is_open();
let left_active_panel = left_dock.active_panel().and_then(|panel| { let left_active_panel = left_dock.visible_panel().and_then(|panel| {
Some( Some(
cx.view_ui_name(panel.as_any().window_id(), panel.id())? cx.view_ui_name(panel.as_any().window_id(), panel.id())?
.to_string(), .to_string(),
@ -2844,7 +2854,7 @@ impl Workspace {
let right_dock = this.right_dock.read(cx); let right_dock = this.right_dock.read(cx);
let right_visible = right_dock.is_open(); let right_visible = right_dock.is_open();
let right_active_panel = right_dock.active_panel().and_then(|panel| { let right_active_panel = right_dock.visible_panel().and_then(|panel| {
Some( Some(
cx.view_ui_name(panel.as_any().window_id(), panel.id())? cx.view_ui_name(panel.as_any().window_id(), panel.id())?
.to_string(), .to_string(),
@ -2853,7 +2863,7 @@ impl Workspace {
let bottom_dock = this.bottom_dock.read(cx); let bottom_dock = this.bottom_dock.read(cx);
let bottom_visible = bottom_dock.is_open(); let bottom_visible = bottom_dock.is_open();
let bottom_active_panel = bottom_dock.active_panel().and_then(|panel| { let bottom_active_panel = bottom_dock.visible_panel().and_then(|panel| {
Some( Some(
cx.view_ui_name(panel.as_any().window_id(), panel.id())? cx.view_ui_name(panel.as_any().window_id(), panel.id())?
.to_string(), .to_string(),
@ -3035,7 +3045,7 @@ impl Workspace {
DockPosition::Right => &self.right_dock, DockPosition::Right => &self.right_dock,
DockPosition::Bottom => &self.bottom_dock, DockPosition::Bottom => &self.bottom_dock,
}; };
let active_panel = dock.read(cx).active_panel()?; let active_panel = dock.read(cx).visible_panel()?;
let element = if Some(active_panel.id()) == self.zoomed.as_ref().map(|zoomed| zoomed.id()) { let element = if Some(active_panel.id()) == self.zoomed.as_ref().map(|zoomed| zoomed.id()) {
dock.read(cx).render_placeholder(cx) dock.read(cx).render_placeholder(cx)
} else { } else {
@ -4171,6 +4181,82 @@ mod tests {
}); });
} }
#[gpui::test]
async fn test_toggle_panel_focus(cx: &mut gpui::TestAppContext) {
init_test(cx);
let fs = FakeFs::new(cx.background());
let project = Project::test(fs, [], cx).await;
let (window_id, workspace) = cx.add_window(|cx| Workspace::test_new(project, cx));
let panel = workspace.update(cx, |workspace, cx| {
let panel = cx.add_view(|_| TestPanel::new(DockPosition::Right));
workspace.add_panel(panel.clone(), cx);
workspace
.right_dock()
.update(cx, |right_dock, cx| right_dock.set_open(true, cx));
panel
});
// Transfer focus from center to panel
workspace.update(cx, |workspace, cx| {
workspace.toggle_panel_focus::<TestPanel>(cx);
});
workspace.read_with(cx, |workspace, cx| {
assert!(workspace.right_dock().read(cx).is_open());
assert!(!panel.is_zoomed(cx));
assert!(panel.has_focus(cx));
});
// Transfer focus from panel to center
workspace.update(cx, |workspace, cx| {
workspace.toggle_panel_focus::<TestPanel>(cx);
});
workspace.read_with(cx, |workspace, cx| {
assert!(workspace.right_dock().read(cx).is_open());
assert!(!panel.is_zoomed(cx));
assert!(!panel.has_focus(cx));
});
// Focus and zoom panel
panel.update(cx, |panel, cx| {
cx.focus_self();
panel.set_zoomed(true, cx)
});
workspace.read_with(cx, |workspace, cx| {
assert!(workspace.right_dock().read(cx).is_open());
assert!(panel.is_zoomed(cx));
assert!(panel.has_focus(cx));
});
// Transfer focus to the center closes the dock
workspace.update(cx, |workspace, cx| {
workspace.toggle_panel_focus::<TestPanel>(cx);
});
workspace.read_with(cx, |workspace, cx| {
assert!(!workspace.right_dock().read(cx).is_open());
assert!(panel.is_zoomed(cx));
assert!(!panel.has_focus(cx));
});
// Transfering focus back to the panel keeps it zoomed
workspace.update(cx, |workspace, cx| {
workspace.toggle_panel_focus::<TestPanel>(cx);
});
workspace.read_with(cx, |workspace, cx| {
assert!(workspace.right_dock().read(cx).is_open());
assert!(panel.is_zoomed(cx));
assert!(panel.has_focus(cx));
});
}
#[gpui::test] #[gpui::test]
async fn test_panels(cx: &mut gpui::TestAppContext) { async fn test_panels(cx: &mut gpui::TestAppContext) {
init_test(cx); init_test(cx);
@ -4194,7 +4280,7 @@ mod tests {
let left_dock = workspace.left_dock(); let left_dock = workspace.left_dock();
assert_eq!( assert_eq!(
left_dock.read(cx).active_panel().unwrap().id(), left_dock.read(cx).visible_panel().unwrap().id(),
panel_1.id() panel_1.id()
); );
assert_eq!( assert_eq!(
@ -4204,7 +4290,12 @@ mod tests {
left_dock.update(cx, |left_dock, cx| left_dock.resize_active_panel(1337., cx)); left_dock.update(cx, |left_dock, cx| left_dock.resize_active_panel(1337., cx));
assert_eq!( assert_eq!(
workspace.right_dock().read(cx).active_panel().unwrap().id(), workspace
.right_dock()
.read(cx)
.visible_panel()
.unwrap()
.id(),
panel_2.id() panel_2.id()
); );
@ -4220,10 +4311,10 @@ mod tests {
// Since panel_1 was visible on the left, it should now be visible now that it's been moved to the right. // Since panel_1 was visible on the left, it should now be visible now that it's been moved to the right.
// Since it was the only panel on the left, the left dock should now be closed. // Since it was the only panel on the left, the left dock should now be closed.
assert!(!workspace.left_dock().read(cx).is_open()); assert!(!workspace.left_dock().read(cx).is_open());
assert!(workspace.left_dock().read(cx).active_panel().is_none()); assert!(workspace.left_dock().read(cx).visible_panel().is_none());
let right_dock = workspace.right_dock(); let right_dock = workspace.right_dock();
assert_eq!( assert_eq!(
right_dock.read(cx).active_panel().unwrap().id(), right_dock.read(cx).visible_panel().unwrap().id(),
panel_1.id() panel_1.id()
); );
assert_eq!(right_dock.read(cx).active_panel_size(cx).unwrap(), 1337.); assert_eq!(right_dock.read(cx).active_panel_size(cx).unwrap(), 1337.);
@ -4238,7 +4329,12 @@ mod tests {
// And the right dock is unaffected in it's displaying of panel_1 // And the right dock is unaffected in it's displaying of panel_1
assert!(workspace.right_dock().read(cx).is_open()); assert!(workspace.right_dock().read(cx).is_open());
assert_eq!( assert_eq!(
workspace.right_dock().read(cx).active_panel().unwrap().id(), workspace
.right_dock()
.read(cx)
.visible_panel()
.unwrap()
.id(),
panel_1.id() panel_1.id()
); );
}); });
@ -4253,7 +4349,7 @@ mod tests {
let left_dock = workspace.left_dock(); let left_dock = workspace.left_dock();
assert!(left_dock.read(cx).is_open()); assert!(left_dock.read(cx).is_open());
assert_eq!( assert_eq!(
left_dock.read(cx).active_panel().unwrap().id(), left_dock.read(cx).visible_panel().unwrap().id(),
panel_1.id() panel_1.id()
); );
assert_eq!(left_dock.read(cx).active_panel_size(cx).unwrap(), 1337.); assert_eq!(left_dock.read(cx).active_panel_size(cx).unwrap(), 1337.);
@ -4287,7 +4383,7 @@ mod tests {
let left_dock = workspace.left_dock(); let left_dock = workspace.left_dock();
assert!(left_dock.read(cx).is_open()); assert!(left_dock.read(cx).is_open());
assert_eq!( assert_eq!(
left_dock.read(cx).active_panel().unwrap().id(), left_dock.read(cx).visible_panel().unwrap().id(),
panel_1.id() panel_1.id()
); );
assert!(panel_1.is_focused(cx)); assert!(panel_1.is_focused(cx));
@ -4301,7 +4397,7 @@ mod tests {
let left_dock = workspace.left_dock(); let left_dock = workspace.left_dock();
assert!(left_dock.read(cx).is_open()); assert!(left_dock.read(cx).is_open());
assert_eq!( assert_eq!(
left_dock.read(cx).active_panel().unwrap().id(), left_dock.read(cx).visible_panel().unwrap().id(),
panel_1.id() panel_1.id()
); );
}); });