zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix panel state (#13668)

Browse Source 
In the latest update, panel loading occasionally occurred randomly,
either before or after workspace deserialization due to their
asynchronous nature. This update addresses the issue by ensuring panels
restore their state based on serialized data, synchronizing their
loading with workspace deserialization.

Release Notes:

- Fixed [#9638](https://github.com/zed-industries/zed/issues/9638)
- Fixed [#12954](https://github.com/zed-industries/zed/issues/12954)
This commit is contained in:
Yongkang Chen 2024-07-03 17:38:19 -07:00 committed by GitHub
parent 52583fe1ed
commit ed09bb949c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/workspace/src/dock.rs
View File

@ -431,25 +431,12 @@ impl Dock {
}),
];
let name = panel.persistent_name().to_string();
self.panel_entries.push(PanelEntry {
panel: Arc::new(panel.clone()),
_subscriptions: subscriptions,
});
if let Some(serialized) = self.serialized_dock.clone() {
if serialized.active_panel == Some(name) {
self.activate_panel(self.panel_entries.len() - 1, cx);
if serialized.visible {
self.set_open(true, cx);
}
if serialized.zoom {
if let Some(panel) = self.active_panel() {
panel.set_zoomed(true, cx)
};
}
}
} else if panel.read(cx).starts_open(cx) {
if !self.restore_state(cx) && panel.read(cx).starts_open(cx) {
self.activate_panel(self.panel_entries.len() - 1, cx);
self.set_open(true, cx);
}
@ -457,6 +444,25 @@ impl Dock {
cx.notify()
}
pub fn restore_state(&mut self, cx: &mut ViewContext<Self>) -> bool {
if let Some(serialized) = self.serialized_dock.clone() {
if let Some(active_panel) = serialized.active_panel {
if let Some(idx) = self.panel_index_for_persistent_name(active_panel.as_str(), cx) {
self.activate_panel(idx, cx);
}
}
if serialized.zoom {
if let Some(panel) = self.active_panel() {
panel.set_zoomed(true, cx)
}
}
self.set_open(serialized.visible, cx);
return true;
}
return false;
}
pub fn remove_panel<T: Panel>(&mut self, panel: &View<T>, cx: &mut ViewContext<Self>) {
if let Some(panel_ix) = self
.panel_entries

24
crates/workspace/src/workspace.rs
View File

@ -3813,18 +3813,18 @@ impl Workspace {
let docks = serialized_workspace.docks;
let right = docks.right.clone();
workspace
.right_dock
.update(cx, |dock, _| dock.serialized_dock = Some(right));
let left = docks.left.clone();
workspace
.left_dock
.update(cx, |dock, _| dock.serialized_dock = Some(left));
let bottom = docks.bottom.clone();
workspace
.bottom_dock
.update(cx, |dock, _| dock.serialized_dock = Some(bottom));
for (dock, serialized_dock) in [
(&mut workspace.right_dock, docks.right),
(&mut workspace.left_dock, docks.left),
(&mut workspace.bottom_dock, docks.bottom),
]
.iter_mut()
{
dock.update(cx, |dock, cx| {
dock.serialized_dock = Some(serialized_dock.clone());
dock.restore_state(cx);
});
}
cx.notify();
})?;