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

Fix panel deserialization (#4198)

Browse source 
In the old world, panel loading happened strictly before workspace
deserialization. Now it's inverted.

Fix this by storing on the dock the serialized state so they can restore
state as panels are loaded.

[[PR Description]]

Release Notes:

- Fixed Zed forgetting which panels were open on boot.
([#2406](https://github.com/zed-industries/community/issues/2406)).
This commit is contained in:
Conrad Irwin 2024-01-22 12:37:38 -07:00 • committed by GitHub
commit c5465d26f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 46 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/zed/src/zed.rs
View file

@ -32,11 +32,11 @@ use util::{
};
use uuid::Uuid;
use welcome::BaseKeymap;
use workspace::Pane;
use workspace::{
create_and_open_local_file, notifications::simple_message_notification::MessageNotification,
open_new, AppState, NewFile, NewWindow, Workspace, WorkspaceSettings,
};
use workspace::{dock::Panel, Pane};
use zed_actions::{OpenBrowser, OpenSettings, OpenZedURL, Quit};
actions!(
@ -178,10 +178,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
)?;
workspace_handle.update(&mut cx, |workspace, cx| {
let (position, was_deserialized) = {
let project_panel = project_panel.read(cx);
(project_panel.position(cx), project_panel.was_deserialized())
};
let was_deserialized = project_panel.read(cx).was_deserialized();
workspace.add_panel(project_panel, cx);
workspace.add_panel(terminal_panel, cx);
workspace.add_panel(assistant_panel, cx);
@ -200,7 +197,7 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
.map_or(false, |entry| entry.is_dir())
})
{
workspace.toggle_dock(position, cx);
workspace.open_panel::<ProjectPanel>(cx);
}
cx.focus_self();
})