Skip to content

fix(desktop): clear overlay restore label on recording mode switch #2098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wizlor-bfw wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −1
Open

fix(desktop): clear overlay restore label on recording mode switch #2098

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion apps/desktop/src-tauri/src/recording_settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cap_recording::{
sources::screen_capture::ScreenCaptureTarget,
};
use std::collections::HashMap;
use tauri::{AppHandle, Wry};
use tauri::{AppHandle, Manager, Wry};
use tauri_plugin_store::StoreExt;

use crate::tray;
Expand Down Expand Up @@ -92,5 +92,15 @@ pub fn camera_key(id: &DeviceOrModelID) -> String {
pub fn set_recording_mode(app: AppHandle, mode: RecordingMode) -> Result<(), String> {
RecordingSettingsStore::set_mode(&app, mode)?;
tray::update_tray_icon_for_mode(&app, mode);

// A mode switch invalidates any pending "restore this overlay when
// Settings closes" instruction — otherwise a stale label can pop the
// target-select overlay back up as a screen-wide input-eating surface
// after the user has moved on to a different mode. See #1945.
if let Some(focus_manager) = app.try_state::<crate::target_select_overlay::WindowFocusManager>()
{
focus_manager.clear_overlay_restore_labels();
}

Ok(())
}