diff --git a/crates/gpui/src/platform/blade/blade_renderer.rs b/crates/gpui/src/platform/blade/blade_renderer.rs index 3a1ae0907f4574..29ccc96a882b51 100644 --- a/crates/gpui/src/platform/blade/blade_renderer.rs +++ b/crates/gpui/src/platform/blade/blade_renderer.rs @@ -723,4 +723,4 @@ impl BladeRenderer { self.wait_for_gpu(); self.last_sync_point = Some(sync_point); } -} \ No newline at end of file +} diff --git a/crates/gpui/src/platform/mac/metal_renderer.rs b/crates/gpui/src/platform/mac/metal_renderer.rs index a82a643c76d3f2..d7a027e5cb1def 100644 --- a/crates/gpui/src/platform/mac/metal_renderer.rs +++ b/crates/gpui/src/platform/mac/metal_renderer.rs @@ -1,13 +1,13 @@ +use super::metal_atlas::MetalAtlas; use crate::{ - platform::mac::ns_string, point, size, AtlasTextureId, AtlasTextureKind, AtlasTile, Bounds, - ContentMask, DevicePixels, Hsla, MonochromeSprite, Path, PathId, PathVertex, - PolychromeSprite, PrimitiveBatch, Quad, ScaledPixels, Scene, Shadow, Size, Surface, Underline, + point, size, AtlasTextureId, AtlasTextureKind, AtlasTile, Bounds, ContentMask, DevicePixels, + Hsla, MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch, Quad, + ScaledPixels, Scene, Shadow, Size, Surface, Underline, }; -use super::metal_atlas::MetalAtlas; use block::ConcreteBlock; use cocoa::{ - base::{nil, NO, YES}, - foundation::{NSDictionary, NSUInteger}, + base::{NO, YES}, + foundation::NSUInteger, quartzcore::AutoresizingMask, }; use collections::HashMap; diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index 70767cc49bc21c..715845bb65792a 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -1,4 +1,4 @@ -use super::{global_bounds_from_ns_rect, ns_string, MacDisplay, NSRange, renderer}; +use super::{global_bounds_from_ns_rect, ns_string, renderer, MacDisplay, NSRange}; use crate::{ global_bounds_to_ns_rect, platform::PlatformInputHandler, point, px, size, AnyWindowHandle, Bounds, DisplayLink, ExternalPaths, FileDropEvent, ForegroundExecutor, GlobalPixels, @@ -477,7 +477,6 @@ impl MacWindowState { unsafe impl Send for MacWindowState {} - pub(crate) struct MacWindow(Arc>); impl MacWindow { @@ -556,7 +555,10 @@ impl MacWindow { WindowBounds::Fixed(bounds) => global_bounds_to_ns_rect(bounds), }; let scale = get_scale_factor(native_window); - size(bounds.size.width as f32 * scale, bounds.size.height as f32 * scale) + size( + bounds.size.width as f32 * scale, + bounds.size.height as f32 * scale, + ) }; let window = Self(Arc::new(Mutex::new(MacWindowState { @@ -565,7 +567,12 @@ impl MacWindow { native_window, native_view: NonNull::new_unchecked(native_view), display_link: None, - renderer: renderer::new_renderer(renderer_context, native_window as *mut _, native_view as *mut _, window_size), + renderer: renderer::new_renderer( + renderer_context, + native_window as *mut _, + native_view as *mut _, + window_size, + ), kind: options.kind, request_frame_callback: None, event_callback: None, @@ -1062,10 +1069,10 @@ impl PlatformWindow for MacWindow { ); let _: () = msg_send![layer, setDeveloperHUDProperties: hud_properties]; } else { - let _: () = msg_send![layer, setDeveloperHUDProperties: NSDictionary::dictionary(nil)]; + let _: () = + msg_send![layer, setDeveloperHUDProperties: NSDictionary::dictionary(nil)]; } } - } }