mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-24 23:47:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #1846 from zed-industries/dont-focus-notification-windows

Browse source 
Don't focus incoming call and project shared notification windows
This commit is contained in:
Antonio Scandurra 2022-11-02 13:21:18 +00:00 committed by GitHub
commit 66b1283c95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/collab_ui/src/incoming_call_notification.rs
View file

@ -41,6 +41,7 @@ pub fn init(cx: &mut MutableAppContext) {
)),
titlebar: None,
center: false,
focus: false,
kind: WindowKind::PopUp,
is_movable: false,
screen: Some(screen),

1
crates/collab_ui/src/project_shared_notification.rs
View file

@ -40,6 +40,7 @@ pub fn init(cx: &mut MutableAppContext) {
)),
titlebar: None,
center: false,
focus: false,
kind: WindowKind::PopUp,
is_movable: false,
screen: Some(screen),

2
crates/gpui/src/platform.rs
View file

@ -152,6 +152,7 @@ pub struct WindowOptions<'a> {
pub bounds: WindowBounds,
pub titlebar: Option<TitlebarOptions<'a>>,
pub center: bool,
pub focus: bool,
pub kind: WindowKind,
pub is_movable: bool,
pub screen: Option<Rc<dyn Screen>>,
@ -296,6 +297,7 @@ impl<'a> Default for WindowOptions<'a> {
traffic_light_position: Default::default(),
}),
center: false,
focus: true,
kind: WindowKind::Normal,
is_movable: true,
screen: None,

6
crates/gpui/src/platform/mac/window.rs
View file

@ -514,7 +514,11 @@ impl Window {
);
}
}
native_window.makeKeyAndOrderFront_(nil);
if options.focus {
native_window.makeKeyAndOrderFront_(nil);
} else {
native_window.orderFront_(nil);
}
window.0.borrow().move_traffic_light();
pool.drain();

1
crates/zed/src/zed.rs
View file

@ -354,6 +354,7 @@ pub fn build_window_options() -> WindowOptions<'static> {
traffic_light_position: Some(vec2f(8., 8.)),
}),
center: false,
focus: true,
kind: WindowKind::Normal,
is_movable: true,
screen: None,