Skip to content

armgit / Cap

Public Imported from GitHub
0

Open source Loom alternative. Beautiful, shareable screen recordings.

fix(desktop-gpui): resolve an unset Instant outcome the same way everywhere

Richie McIlroyfc57b1d5c6fb
diff --git a/apps/desktop-gpui/src/settings_pages.rs b/apps/desktop-gpui/src/settings_pages.rs
index 25a792481..29deb0a3a 100644
--- a/apps/desktop-gpui/src/settings_pages.rs
+++ b/apps/desktop-gpui/src/settings_pages.rs
@@ -1646,7 +1646,7 @@ impl SettingsWindow {
if let Some((value, _)) = INSTANT_OUTCOMES.get(index) {
let (disable_open, show_main) = value.store_values();
this.settings.disable_auto_open_links = disable_open;
- this.settings.show_main_window_after_instant = show_main;
+ this.settings.show_main_window_after_instant = Some(show_main);
this.write_bool("disableAutoOpenLinks", disable_open, cx);
this.write_bool(store::SHOW_MAIN_WINDOW_AFTER_INSTANT_KEY, show_main, cx);
}
diff --git a/apps/desktop-gpui/src/store.rs b/apps/desktop-gpui/src/store.rs
index 8c1afdd07..fccc0918d 100644
--- a/apps/desktop-gpui/src/store.rs
+++ b/apps/desktop-gpui/src/store.rs
@@ -1019,9 +1019,9 @@ pub struct GeneralSettings {
pub disable_auto_open_links: bool,
/// GPUI-only `showMainWindowAfterInstantRecording`: whether the main
/// window comes back after an Instant recording whose link did not open.
- /// Absent, it follows `disableAutoOpenLinks`, which is what "copy link
- /// only" did before the key existed. See [`Self::post_instant_behaviour`].
- pub show_main_window_after_instant: bool,
+ /// Kept as stored, absent included, so every reader resolves it the same
+ /// way in [`Self::post_instant_behaviour`].
+ pub show_main_window_after_instant: Option<bool>,
pub studio_recording_quality: StudioQuality,
pub recording_countdown: Option<u32>,
pub main_window_recording_start_behaviour: MainWindowStartBehaviour,
@@ -1392,7 +1392,9 @@ impl GeneralSettings {
pub fn post_instant_behaviour(&self) -> PostInstantBehaviour {
if !self.disable_auto_open_links {
PostInstantBehaviour::OpenLink
- } else if self.show_main_window_after_instant {
+ } else if self.show_main_window_after_instant.unwrap_or(true) {
+ // Absent: "copy link only" brought the main window back before
+ // the key existed, so a store that never set it keeps doing that.
PostInstantBehaviour::ShowCap
} else {
PostInstantBehaviour::CopyLink
@@ -1422,11 +1424,9 @@ impl GeneralSettings {
enable_notifications: bool_at(general, "enableNotifications", true),
instant_mode_max_resolution: u32_at(general, "instantModeMaxResolution", 1920),
disable_auto_open_links: bool_at(general, "disableAutoOpenLinks", false),
- show_main_window_after_instant: bool_at(
- general,
- SHOW_MAIN_WINDOW_AFTER_INSTANT_KEY,
- bool_at(general, "disableAutoOpenLinks", false),
- ),
+ show_main_window_after_instant: general
+ .get(SHOW_MAIN_WINDOW_AFTER_INSTANT_KEY)
+ .and_then(Value::as_bool),
studio_recording_quality: enum_at(general, "studioRecordingQuality"),
recording_countdown: opt_u32_at(general, "recordingCountdown"),
main_window_recording_start_behaviour: enum_at(
@@ -3432,6 +3432,16 @@ mod tests {
]),
PostInstantBehaviour::OpenLink
);
+ // The Quality page's auto-open toggle writes only
+ // `disableAutoOpenLinks`; the open window and a reload must agree.
+ let toggled = GeneralSettings {
+ disable_auto_open_links: true,
+ ..GeneralSettings::default()
+ };
+ assert_eq!(
+ toggled.post_instant_behaviour(),
+ settings(&[("disableAutoOpenLinks", true)])
+ );
for behaviour in [
PostInstantBehaviour::OpenLink,
PostInstantBehaviour::ShowCap,