Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(desktop-gpui): translate a missing remembered camera's name when it renders

Richie McIlroy57481998e288
diff --git a/apps/desktop-gpui/src/main_window.rs b/apps/desktop-gpui/src/main_window.rs
index 4d89e5211..539360e9a 100644
--- a/apps/desktop-gpui/src/main_window.rs
+++ b/apps/desktop-gpui/src/main_window.rs
@@ -56,12 +56,22 @@ fn remembered_camera(id: &recording::DeviceOrModelID, cameras: &[CameraOption])
recording::DeviceOrModelID::ModelID(model) => Some(model.clone()),
recording::DeviceOrModelID::DeviceID(_) => None,
},
- label: tr::main::device::fallback_camera().to_string(),
+ label: String::new(),
best_format: None,
formats: Vec::new(),
})
}
+/// A remembered camera that isn't connected has no device name, so its row
+/// reads the fallback through the active locale on every render.
+pub(crate) fn camera_label(label: &str) -> String {
+ if label.is_empty() {
+ tr::main::device::fallback_camera().to_string()
+ } else {
+ label.to_string()
+ }
+}
+
fn remembered_microphone(name: &str, microphones: &[MicrophoneOption]) -> MicrophoneOption {
microphones
.iter()
@@ -4032,7 +4042,7 @@ impl MainWindow {
.text_size(px(12.))
.text_color(theme.gray_11)
.child(match self.device_format_target.as_ref().unwrap() {
- DeviceFormatTarget::Camera(camera) => camera.label.clone(),
+ DeviceFormatTarget::Camera(camera) => camera_label(&camera.label),
DeviceFormatTarget::Microphone(name) => name.clone(),
})
.into_any_element(),
@@ -6618,7 +6628,7 @@ impl MainWindow {
"icons/camera.svg",
self.camera
.as_ref()
- .map(|camera| camera.label.clone())
+ .map(|camera| camera_label(&camera.label))
.unwrap_or_else(|| tr::main::device::no_camera().into()),
if self.camera.is_some()
&& let Some(pill) = self.access_pill(OSPermission::Camera, cx)
@@ -6997,6 +7007,12 @@ mod remembered_device_tests {
let restored = remembered_camera(&missing, &cameras);
assert_eq!(restored.device_id, "remembered");
assert_ne!(restored, cameras[0]);
+ assert_eq!(restored.label, "");
+ assert_eq!(
+ camera_label(&restored.label),
+ tr::main::device::fallback_camera()
+ );
+ assert_eq!(camera_label(&cameras[0].label), cameras[0].label);
let microphones = [MicrophoneOption {
name: "Unrequested microphone".into(),
diff --git a/apps/desktop-gpui/src/target_overlay.rs b/apps/desktop-gpui/src/target_overlay.rs
index 7e5872a45..3afd73bc7 100644
--- a/apps/desktop-gpui/src/target_overlay.rs
+++ b/apps/desktop-gpui/src/target_overlay.rs
@@ -1245,7 +1245,8 @@ impl OverlayWindow {
return div().into_any_element();
};
let selected = if camera {
- view.camera_selection().map(|camera| camera.label.clone())
+ view.camera_selection()
+ .map(|camera| crate::main_window::camera_label(&camera.label))
} else {
view.microphone_selection().map(|mic| mic.name.clone())
};