From 6b48a6e690d0ef54d215a87f5db132832ffec56d Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 3 Feb 2025 13:35:16 +0100
Subject: [PATCH] workspace: Respect minimized state when deserializing
 workspaces (#24127)

Fixes a regression from #24015 pointed out in #24093

Closes #24093

Release Notes:

- N/A
---
 crates/editor/src/editor.rs       | 1 +
 crates/workspace/src/workspace.rs | 5 +----
 crates/zed/src/zed.rs             | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 9aeba2a22e..4d9ad08c82 100644
--- 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
index 095abcb061..d052f55892 100644
--- 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
index 7bedb1b994..5d90d582c9 100644
--- 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)
                         },
                     )