Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a double borrow error in window.open

Browse source 
It seems that sometimes calling toggleFullScreen will cause the
display_layer callback of a different window to fire.
This commit is contained in:
Conrad Irwin 2024-01-18 20:47:29 -07:00
parent decf320a74
commit 87d60beda7
1 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -516,25 +516,6 @@ impl MacWindow {
NSArray::arrayWithObject(nil, NSFilenamesPboardType) NSArray::arrayWithObject(nil, NSFilenamesPboardType)
]; ];
let screen = native_window.screen();
match options.bounds {
WindowBounds::Fullscreen => {
native_window.toggleFullScreen_(nil);
}
WindowBounds::Maximized => {
native_window.setFrame_display_(screen.visibleFrame(), YES);
}
WindowBounds::Fixed(bounds) => {
let display_bounds = display.bounds();
let frame = if bounds.intersects(&display_bounds) {
display_bounds_to_native(bounds)
} else {
display_bounds_to_native(display_bounds)
};
native_window.setFrame_display_(mem::transmute::<CGRect, NSRect>(frame), YES);
}
}
let native_view: id = msg_send![VIEW_CLASS, alloc]; let native_view: id = msg_send![VIEW_CLASS, alloc];
let native_view = NSView::init(native_view); let native_view = NSView::init(native_view);
@ -656,6 +637,27 @@ impl MacWindow {
native_window.orderFront_(nil); native_window.orderFront_(nil);
} }
let screen = native_window.screen();
match options.bounds {
WindowBounds::Fullscreen => {
// We need to toggle full screen asynchronously as doing so may
// call back into the platform handlers.
window.toggle_full_screen()
}
WindowBounds::Maximized => {
native_window.setFrame_display_(screen.visibleFrame(), YES);
}
WindowBounds::Fixed(bounds) => {
let display_bounds = display.bounds();
let frame = if bounds.intersects(&display_bounds) {
display_bounds_to_native(bounds)
} else {
display_bounds_to_native(display_bounds)
};
native_window.setFrame_display_(mem::transmute::<CGRect, NSRect>(frame), YES);
}
}
window.0.lock().move_traffic_light(); window.0.lock().move_traffic_light();
pool.drain(); pool.drain();