From b9188e0fd38a9738b4891b4e414cd41c77d6fa35 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 19 Sep 2025 18:38:22 +0200 Subject: [PATCH] collab: Fix screen share aspect ratio on non-Mac platforms (#38517) It was just a bunch of finnickery around UI layout. It affected Linux too. Release Notes: * Fixed aspect ratio of peer screen share when using Linux/Windows builds. --- Cargo.lock | 1 + crates/livekit_client/Cargo.toml | 1 + crates/livekit_client/src/remote_video_track_view.rs | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index ed1e9bef3f1797201dd791a7b4616509bbbc5036..8fd76300f7507a284375e12e1275724972bebe7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10163,6 +10163,7 @@ dependencies = [ "simplelog", "smallvec", "tokio-tungstenite 0.26.2", + "ui", "util", "workspace-hack", ] diff --git a/crates/livekit_client/Cargo.toml b/crates/livekit_client/Cargo.toml index 80e4960c0df31f6a3d8115bd4bd66c0de09b76f0..2400092c1c154b8d6a4ee24f43c0556a26dc532e 100644 --- a/crates/livekit_client/Cargo.toml +++ b/crates/livekit_client/Cargo.toml @@ -41,6 +41,7 @@ serde_urlencoded.workspace = true settings.workspace = true smallvec.workspace = true tokio-tungstenite.workspace = true +ui.workspace = true util.workspace = true workspace-hack.workspace = true diff --git a/crates/livekit_client/src/remote_video_track_view.rs b/crates/livekit_client/src/remote_video_track_view.rs index 9073b8729a1d72ef59fe6ed77fd727cdf6acae00..189806f2138e401e62ad46336e95d8468e3b3732 100644 --- a/crates/livekit_client/src/remote_video_track_view.rs +++ b/crates/livekit_client/src/remote_video_track_view.rs @@ -97,8 +97,10 @@ impl Render for RemoteVideoTrackView { self.previous_rendered_frame = Some(current_rendered_frame) } self.current_rendered_frame = Some(latest_frame.clone()); - return gpui::img(latest_frame.clone()) + use gpui::ParentElement; + return ui::h_flex() .size_full() + .child(gpui::img(latest_frame.clone()).size_full()) .into_any_element(); }