diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs index 1e6f97c534..48760dccf5 100644 --- a/crates/gpui/src/app.rs +++ b/crates/gpui/src/app.rs @@ -32,6 +32,7 @@ use util::{ResultExt, debug_panic}; #[cfg(any(feature = "inspector", debug_assertions))] use crate::InspectorElementRegistry; +use crate::colors::{Colors, GlobalColors}; use crate::{ Action, ActionBuildError, ActionRegistry, Any, AnyView, AnyWindowHandle, AppContext, Asset, AssetSource, BackgroundExecutor, Bounds, ClipboardItem, CursorStyle, DispatchPhase, DisplayId, @@ -39,10 +40,8 @@ use crate::{ Keymap, Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform, PlatformDisplay, PlatformKeyboardLayout, Point, PromptBuilder, PromptButton, PromptHandle, PromptLevel, Render, RenderImage, RenderablePromptHandle, Reservation, ScreenCaptureSource, - SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, WaylandClient, Window, - WindowAppearance, WindowHandle, WindowId, WindowInvalidator, - colors::{Colors, GlobalColors}, - current_platform, hash, init_app_menus, + SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, Window, WindowAppearance, + WindowHandle, WindowId, WindowInvalidator, current_platform, hash, init_app_menus, }; mod async_context; diff --git a/crates/gpui/src/platform/linux/wayland/client.rs b/crates/gpui/src/platform/linux/wayland/client.rs index 5586684d6a..aae2b98f2e 100644 --- a/crates/gpui/src/platform/linux/wayland/client.rs +++ b/crates/gpui/src/platform/linux/wayland/client.rs @@ -353,7 +353,7 @@ impl WaylandClientStatePtr { } changed } else { - let changed: bool = &UNKNOWN_KEYBOARD_LAYOUT_NAME != state.keyboard_layout.name(); + let changed = &UNKNOWN_KEYBOARD_LAYOUT_NAME != state.keyboard_layout.name(); if changed { state.keyboard_layout = LinuxKeyboardLayout::new(UNKNOWN_KEYBOARD_LAYOUT_NAME); } diff --git a/crates/gpui/src/platform/mac/platform.rs b/crates/gpui/src/platform/mac/platform.rs index c1f8895982..51aef802df 100644 --- a/crates/gpui/src/platform/mac/platform.rs +++ b/crates/gpui/src/platform/mac/platform.rs @@ -162,6 +162,7 @@ pub(crate) struct MacPlatformState { metadata_pasteboard_type: id, reopen: Option>, on_keyboard_layout_change: Option>, + quit_when_last_window_closes: bool, quit: Option>, menu_command: Option>, validate_menu_command: Option bool>>,