workspace: Respect minimized state when deserializing workspaces

Fixes a regression from #24015 pointed out in #24093
zed-industries · Feb 3, 2025 · 84bcdb7 · 84bcdb7
1 parent f45d58f
commit 84bcdb7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
@@ -332,6 +332,7 @@ pub fn init(cx: &mut App) {
                 app_state,
                 cx,
                 |workspace, window, cx| {
+                    cx.activate(true);
                     Editor::new_file(workspace, &Default::default(), window, cx)
                 },
             )

diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
@@ -1284,10 +1284,7 @@ impl Workspace {
                 .unwrap_or_default();
 
             window
-                .update(&mut cx, |_, window, cx| {
-                    window.activate_window();
-                    cx.activate(true);
-                })
+                .update(&mut cx, |_, window, _| window.activate_window())
                 .log_err();
             Ok((window, opened_items))
         })

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
@@ -796,6 +796,7 @@ fn register_actions(
                         app_state,
                         cx,
                         |workspace, window, cx| {
+                            cx.activate(true);
                             Editor::new_file(workspace, &Default::default(), window, cx)
                         },
                     )