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

ssh: Ensure long server names (and nicknames) truncate (#19621)

Browse source 
Just polishing the UI a bit more. One drawback of this, though, is that
if you _do_ have a big nickname or server name, with this current
solution, you won't be able to see it. Ideally, we should be able to
hover over it and see it in a tooltip, but the `div` still doesn't
support that out of the box.

| Main modal | Modal header |
|--------|--------|
| <img width="1136" alt="Screenshot 2024-10-23 at 12 49 18"
src="https://github.com/user-attachments/assets/ed5f0222-faa1-49bd-b249-2f22497566d8">
| <img width="1136" alt="Screenshot 2024-10-23 at 12 49 23"
src="https://github.com/user-attachments/assets/5a464b12-99e8-4934-aa6a-c9c4c40ea4d4">
|

Release Notes:

- N/A
This commit is contained in:
Danilo Leal 2024-10-23 13:31:03 -03:00 • committed by GitHub
parent 6a0c19fcf9
commit c3860804ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/recent_projects/src/remote_servers.rs
View file

@ -660,11 +660,12 @@ impl RemoteServerProjects {
.px_3() .px_3()
.gap_1() .gap_1()
.overflow_hidden() .overflow_hidden()
.whitespace_nowrap()
.child( .child(
Label::new(main_label) div().max_w_96().overflow_hidden().text_ellipsis().child(
.size(LabelSize::Small) Label::new(main_label)
.color(Color::Muted), .size(LabelSize::Small)
.color(Color::Muted),
),
) )
.children( .children(
aux_label.map(|label| { aux_label.map(|label| {

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

@ -336,17 +336,26 @@ impl RenderOnce for SshConnectionHeader {
.child( .child(
h_flex() h_flex()
.gap_1() .gap_1()
.child(Headline::new(main_label).size(HeadlineSize::XSmall)) .overflow_x_hidden()
.child(
div()
.max_w_96()
.overflow_x_hidden()
.text_ellipsis()
.child(Headline::new(main_label).size(HeadlineSize::XSmall)),
)
.children( .children(
meta_label.map(|label| { meta_label.map(|label| {
Label::new(label).color(Color::Muted).size(LabelSize::Small) Label::new(label).color(Color::Muted).size(LabelSize::Small)
}), }),
) )
.children(self.paths.into_iter().map(|path| { .child(div().overflow_x_hidden().text_ellipsis().children(
Label::new(path.to_string_lossy().to_string()) self.paths.into_iter().map(|path| {
.size(LabelSize::Small) Label::new(path.to_string_lossy().to_string())
.color(Color::Muted) .size(LabelSize::Small)
})), .color(Color::Muted)
}),
)),
) )
} }
} }

2
crates/remote/src/ssh_session.rs
View file

@ -1530,7 +1530,7 @@ impl SshRemoteConnection {
run_cmd(self.socket.ssh_command("mkdir").arg("-p").arg(parent)).await?; run_cmd(self.socket.ssh_command("mkdir").arg("-p").arg(parent)).await?;
} }
delegate.set_status(Some("Downloading remote development server on host..."), cx); delegate.set_status(Some("Downloading remote development server on host"), cx);
let script = format!( let script = format!(
r#" r#"