Skip to content

fix(positioner): fallback to primary monitor when current_monitor is None instead of panicking #3197

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
johnyburd wants to merge 2 commits into
base: v2
Choose a base branch
from
Open

fix(positioner): fallback to primary monitor when current_monitor is None instead of panicking #3197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a031e74
fallback to primary monitor when current_monitor is None instead of p…
johnyburd Dec 22, 2025
b119bf8
Merge branch 'v2' into fix/macos-multimonitor-crash
johnyburd Jan 7, 2026
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
8 changes: 7 additions & 1 deletion plugins/positioner/src/ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,13 @@ fn calculate_position<R: Runtime>(
) -> Result<PhysicalPosition<i32>> {
use Position::*;

let screen = window.current_monitor()?.unwrap();
let screen = window.current_monitor()?;
let screen = if let Some(screen) = screen {
screen
} else {
// falling back to primary fixes a crash on macOS when using multiple monitors but current_monitor() is None
window.primary_monitor()?.unwrap()
};
// Only use the screen_position for the Tray independent positioning,
// because a tray event may not be called on the currently active monitor.
let screen_position = screen.position();
Expand Down