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

Properly restore window position for SSH projects (#29904)

Browse source 
Release Notes:

- Fixed SSH projects not restoring their window position on reopen
This commit is contained in:
Kirill Bulatov 2025-05-05 11:46:49 +03:00 • committed by GitHub
parent 0119b66426
commit 0048e67832
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 84 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/recent_projects/src/ssh_connections.rs
View file

@ -1,7 +1,7 @@
use std::collections::BTreeSet;
use std::{path::PathBuf, sync::Arc, time::Duration};
use anyhow::{Result, anyhow};
use anyhow::{Context as _, Result, anyhow};
use auto_update::AutoUpdater;
use editor::Editor;
use extension_host::ExtensionStore;
@ -565,7 +565,23 @@ pub async fn open_ssh_project(
let window = if let Some(window) = open_options.replace_window {
window
} else {
let options = cx.update(|cx| (app_state.build_window_options)(None, cx))?;
let workspace_position = cx
.update(|cx| {
workspace::ssh_workspace_position_from_db(
connection_options.host.clone(),
connection_options.port,
connection_options.username.clone(),
&paths,
cx,
)
})?
.await
.context("fetching ssh workspace position from db")?;
let mut options =
cx.update(|cx| (app_state.build_window_options)(workspace_position.display, cx))?;
options.window_bounds = workspace_position.window_bounds;
cx.open_window(options, |window, cx| {
let project = project::Project::local(
app_state.client.clone(),
@ -576,7 +592,11 @@ pub async fn open_ssh_project(
None,
cx,
);
cx.new(|cx| Workspace::new(None, project, app_state.clone(), window, cx))
cx.new(|cx| {
let mut workspace = Workspace::new(None, project, app_state.clone(), window, cx);
workspace.centered_layout = workspace_position.centered_layout;
workspace
})
})?
};
@ -634,7 +654,7 @@ pub async fn open_ssh_project(
.ok();
if let Err(e) = did_open_ssh_project {
log::error!("Failed to open project: {:?}", e);
log::error!("Failed to open project: {e:?}");
let response = window
.update(cx, |_, window, cx| {
window.prompt(