diff --git a/crates/gpui/examples/bench/data_table.rs b/crates/gpui/examples/bench/data_table.rs index e49ef4f858..04b507070f 100644 --- a/crates/gpui/examples/bench/data_table.rs +++ b/crates/gpui/examples/bench/data_table.rs @@ -1,9 +1,9 @@ use std::{ops::Range, rc::Rc, time::Duration}; use gpui::{ - App, Bounds, Context, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point, - Render, SharedString, UniformListScrollHandle, Window, WindowBounds, WindowOptions, canvas, - div, point, prelude::*, px, rgb, size, uniform_list, + App, Bounds, Context, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point, Render, + SharedString, UniformListScrollHandle, Window, WindowBounds, WindowOptions, canvas, div, point, + prelude::*, px, rgb, size, uniform_list, }; const TOTAL_ITEMS: usize = 10000; diff --git a/crates/gpui/examples/bench/paths_bench.rs b/crates/gpui/examples/bench/paths_bench.rs index 4c9e89f864..7a030a63ca 100644 --- a/crates/gpui/examples/bench/paths_bench.rs +++ b/crates/gpui/examples/bench/paths_bench.rs @@ -1,7 +1,7 @@ use gpui::{ - Background, Bounds, ColorSpace, Context, Path, PathBuilder, Pixels, Render, - TitlebarOptions, Window, WindowBounds, WindowOptions, canvas, div, linear_color_stop, - linear_gradient, point, prelude::*, px, rgb, size, + Background, Bounds, ColorSpace, Context, Path, PathBuilder, Pixels, Render, TitlebarOptions, + Window, WindowBounds, WindowOptions, canvas, div, linear_color_stop, linear_gradient, point, + prelude::*, px, rgb, size, }; const DEFAULT_WINDOW_WIDTH: Pixels = px(1024.0); diff --git a/crates/gpui/examples/bench/pattern.rs b/crates/gpui/examples/bench/pattern.rs index e7c7069370..3f11adb968 100644 --- a/crates/gpui/examples/bench/pattern.rs +++ b/crates/gpui/examples/bench/pattern.rs @@ -1,6 +1,6 @@ use gpui::{ - App, AppContext, Bounds, Context, Window, WindowBounds, WindowOptions, div, - linear_color_stop, linear_gradient, pattern_slash, prelude::*, px, rgb, size, + App, AppContext, Bounds, Context, Window, WindowBounds, WindowOptions, div, linear_color_stop, + linear_gradient, pattern_slash, prelude::*, px, rgb, size, }; struct PatternExample; diff --git a/crates/gpui/examples/bench/shadow.rs b/crates/gpui/examples/bench/shadow.rs index 99e1307bfb..f600364516 100644 --- a/crates/gpui/examples/bench/shadow.rs +++ b/crates/gpui/examples/bench/shadow.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, BoxShadow, Context, Div, SharedString, Window, WindowBounds, - WindowOptions, div, hsla, point, prelude::*, px, relative, rgb, size, + App, Bounds, BoxShadow, Context, Div, SharedString, Window, WindowBounds, WindowOptions, div, + hsla, point, prelude::*, px, relative, rgb, size, }; struct Shadow {} diff --git a/crates/gpui/examples/learn/animation.rs b/crates/gpui/examples/learn/animation.rs index 53254633ac..0a538441e8 100644 --- a/crates/gpui/examples/learn/animation.rs +++ b/crates/gpui/examples/learn/animation.rs @@ -15,9 +15,9 @@ use std::time::Duration; use anyhow::Result; use gpui::colors::Colors; use gpui::{ - Animation, AnimationExt as _, App, AssetSource, Bounds, Context, Hsla, - SharedString, Transformation, Window, WindowBounds, WindowOptions, bounce, div, ease_in_out, - linear, percentage, prelude::*, px, rgb, size as gpui_size, svg, + Animation, AnimationExt as _, App, AssetSource, Bounds, Context, Hsla, SharedString, + Transformation, Window, WindowBounds, WindowOptions, bounce, div, ease_in_out, linear, + percentage, prelude::*, px, rgb, size as gpui_size, svg, }; struct Assets {} diff --git a/crates/gpui/examples/learn/async_tasks.rs b/crates/gpui/examples/learn/async_tasks.rs index 4959d85e1b..355c72ad66 100644 --- a/crates/gpui/examples/learn/async_tasks.rs +++ b/crates/gpui/examples/learn/async_tasks.rs @@ -14,8 +14,8 @@ use std::time::Duration; use gpui::colors::Colors; use gpui::{ - App, Bounds, Context, Entity, Render, Task, Window, WindowBounds, WindowOptions, - div, prelude::*, px, rgb, size, + App, Bounds, Context, Entity, Render, Task, Window, WindowBounds, WindowOptions, div, + prelude::*, px, rgb, size, }; // Example 1: Simple Foreground Task diff --git a/crates/gpui/examples/learn/creating_components.rs b/crates/gpui/examples/learn/creating_components.rs index 94eba05027..3fa08c6261 100644 --- a/crates/gpui/examples/learn/creating_components.rs +++ b/crates/gpui/examples/learn/creating_components.rs @@ -13,8 +13,8 @@ mod example_prelude; use example_prelude::init_example; use gpui::colors::Colors; use gpui::{ - App, Bounds, Context, Entity, IntoElement, Render, RenderOnce, Window, - WindowBounds, WindowOptions, div, prelude::*, px, rgb, size, + App, Bounds, Context, Entity, IntoElement, Render, RenderOnce, Window, WindowBounds, + WindowOptions, div, prelude::*, px, rgb, size, }; // ============================================================================ diff --git a/crates/gpui/examples/learn/custom_drawing.rs b/crates/gpui/examples/learn/custom_drawing.rs index 49e743769c..08d013e7cd 100644 --- a/crates/gpui/examples/learn/custom_drawing.rs +++ b/crates/gpui/examples/learn/custom_drawing.rs @@ -9,9 +9,9 @@ use gpui::colors::Colors; use gpui::{ - App, Bounds, Context, Hsla, MouseButton, MouseDownEvent, MouseMoveEvent, - MouseUpEvent, Path, PathBuilder, Pixels, Point, Render, Rgba, Window, WindowBounds, - WindowOptions, canvas, div, fill, point, prelude::*, px, rgb, size, + App, Bounds, Context, Hsla, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Path, + PathBuilder, Pixels, Point, Render, Rgba, Window, WindowBounds, WindowOptions, canvas, div, + fill, point, prelude::*, px, rgb, size, }; #[path = "../shared/prelude.rs"] diff --git a/crates/gpui/examples/learn/interactive_elements.rs b/crates/gpui/examples/learn/interactive_elements.rs index 523b81482c..92b112e50a 100644 --- a/crates/gpui/examples/learn/interactive_elements.rs +++ b/crates/gpui/examples/learn/interactive_elements.rs @@ -13,9 +13,8 @@ mod example_prelude; use example_prelude::init_example; use gpui::colors::Colors; use gpui::{ - App, Bounds, ClickEvent, Context, Entity, Half, Hsla, IntoElement, MouseButton, - MouseMoveEvent, Pixels, Point, Render, Window, WindowBounds, WindowOptions, div, prelude::*, - px, rgb, size, + App, Bounds, ClickEvent, Context, Entity, Half, Hsla, IntoElement, MouseButton, MouseMoveEvent, + Pixels, Point, Render, Window, WindowBounds, WindowOptions, div, prelude::*, px, rgb, size, }; // ============================================================================ diff --git a/crates/gpui/examples/learn/layout.rs b/crates/gpui/examples/learn/layout.rs index 66bfa73027..7879b83fd3 100644 --- a/crates/gpui/examples/learn/layout.rs +++ b/crates/gpui/examples/learn/layout.rs @@ -12,8 +12,8 @@ mod example_prelude; use example_prelude::init_example; use gpui::colors::Colors; use gpui::{ - App, Bounds, Context, Div, Hsla, Render, Rgba, Window, WindowBounds, - WindowOptions, div, prelude::*, px, size, + App, Bounds, Context, Div, Hsla, Render, Rgba, Window, WindowBounds, WindowOptions, div, + prelude::*, px, size, }; // Helper: Colored block for visualization diff --git a/crates/gpui/examples/learn/styling.rs b/crates/gpui/examples/learn/styling.rs index f40fa4cb64..b08bd4f346 100644 --- a/crates/gpui/examples/learn/styling.rs +++ b/crates/gpui/examples/learn/styling.rs @@ -8,8 +8,8 @@ use gpui::colors::Colors; use gpui::{ - App, Bounds, Context, FocusHandle, Hsla, KeyBinding, Menu, MenuItem, Render, Rgba, - Window, WindowBounds, WindowOptions, actions, div, prelude::*, px, rgb, size, + App, Bounds, Context, FocusHandle, Hsla, KeyBinding, Menu, MenuItem, Render, Rgba, Window, + WindowBounds, WindowOptions, actions, div, prelude::*, px, rgb, size, }; actions!(styling_example, [Quit, Tab, TabPrev]); diff --git a/crates/gpui/examples/learn/text.rs b/crates/gpui/examples/learn/text.rs index 30ff8261e1..6b21a25f31 100644 --- a/crates/gpui/examples/learn/text.rs +++ b/crates/gpui/examples/learn/text.rs @@ -14,9 +14,8 @@ mod example_prelude; use example_prelude::init_example; use gpui::{ - App, Bounds, Context, FontStyle, FontWeight, Hsla, Render, StyledText, - TextOverflow, Window, WindowBounds, WindowOptions, colors::Colors, div, - prelude::*, px, relative, rgb, size, + App, Bounds, Context, FontStyle, FontWeight, Hsla, Render, StyledText, TextOverflow, Window, + WindowBounds, WindowOptions, colors::Colors, div, prelude::*, px, relative, rgb, size, }; // Text Styling Examples diff --git a/crates/gpui/examples/legacy/focus_visible.rs b/crates/gpui/examples/legacy/focus_visible.rs index 2cab61de4f..21387dae2d 100644 --- a/crates/gpui/examples/legacy/focus_visible.rs +++ b/crates/gpui/examples/legacy/focus_visible.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, Div, ElementId, FocusHandle, KeyBinding, SharedString, - Stateful, Window, WindowBounds, WindowOptions, actions, div, prelude::*, px, size, + App, Bounds, Context, Div, ElementId, FocusHandle, KeyBinding, SharedString, Stateful, Window, + WindowBounds, WindowOptions, actions, div, prelude::*, px, size, }; actions!(example, [Tab, TabPrev, Quit]); diff --git a/crates/gpui/examples/legacy/gradient.rs b/crates/gpui/examples/legacy/gradient.rs index d1d2f92720..c01ef84f82 100644 --- a/crates/gpui/examples/legacy/gradient.rs +++ b/crates/gpui/examples/legacy/gradient.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, ColorSpace, Context, Half, Render, Window, WindowOptions, canvas, - div, linear_color_stop, linear_gradient, point, prelude::*, px, size, + App, Bounds, ColorSpace, Context, Half, Render, Window, WindowOptions, canvas, div, + linear_color_stop, linear_gradient, point, prelude::*, px, size, }; struct GradientViewer { diff --git a/crates/gpui/examples/legacy/hello_world.rs b/crates/gpui/examples/legacy/hello_world.rs index 7850ff4f11..047441e72b 100644 --- a/crates/gpui/examples/legacy/hello_world.rs +++ b/crates/gpui/examples/legacy/hello_world.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, SharedString, Window, WindowBounds, WindowOptions, div, - prelude::*, px, rgb, size, + App, Bounds, Context, SharedString, Window, WindowBounds, WindowOptions, div, prelude::*, px, + rgb, size, }; struct HelloWorld { diff --git a/crates/gpui/examples/legacy/image_loading.rs b/crates/gpui/examples/legacy/image_loading.rs index 7c59f34020..8096354601 100644 --- a/crates/gpui/examples/legacy/image_loading.rs +++ b/crates/gpui/examples/legacy/image_loading.rs @@ -1,8 +1,8 @@ use std::{path::Path, sync::Arc, time::Duration}; use gpui::{ - Animation, AnimationExt, App, Asset, AssetLogger, AssetSource, Bounds, Context, - Hsla, ImageAssetLoader, ImageCacheError, ImgResourceLoader, LOADING_DELAY, Length, RenderImage, + Animation, AnimationExt, App, Asset, AssetLogger, AssetSource, Bounds, Context, Hsla, + ImageAssetLoader, ImageCacheError, ImgResourceLoader, LOADING_DELAY, Length, RenderImage, Resource, SharedString, Window, WindowBounds, WindowOptions, black, div, img, prelude::*, pulsating_between, px, red, size, }; diff --git a/crates/gpui/examples/legacy/input.rs b/crates/gpui/examples/legacy/input.rs index 7eb708c0bb..d9b758add3 100644 --- a/crates/gpui/examples/legacy/input.rs +++ b/crates/gpui/examples/legacy/input.rs @@ -1,9 +1,9 @@ use std::ops::Range; use gpui::{ - App, Bounds, ClipboardItem, Context, CursorStyle, ElementId, ElementInputHandler, - Entity, EntityInputHandler, FocusHandle, Focusable, GlobalElementId, KeyBinding, Keystroke, - LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, Pixels, Point, + App, Bounds, ClipboardItem, Context, CursorStyle, ElementId, ElementInputHandler, Entity, + EntityInputHandler, FocusHandle, Focusable, GlobalElementId, KeyBinding, Keystroke, LayoutId, + MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, Pixels, Point, ShapedLine, SharedString, Style, TextRun, UTF16Selection, UnderlineStyle, Window, WindowBounds, WindowOptions, actions, black, div, fill, hsla, opaque_grey, point, prelude::*, px, relative, rgb, rgba, size, white, yellow, diff --git a/crates/gpui/examples/legacy/layer_shell.rs b/crates/gpui/examples/legacy/layer_shell.rs index 1ac3078203..49dd6b5348 100644 --- a/crates/gpui/examples/legacy/layer_shell.rs +++ b/crates/gpui/examples/legacy/layer_shell.rs @@ -11,9 +11,8 @@ mod example { use std::time::{Duration, SystemTime, UNIX_EPOCH}; use gpui::{ - App, Bounds, Context, FontWeight, Size, Window, WindowBackgroundAppearance, - WindowBounds, WindowKind, WindowOptions, div, layer_shell::*, point, prelude::*, px, rems, - rgba, white, + App, Bounds, Context, FontWeight, Size, Window, WindowBackgroundAppearance, WindowBounds, + WindowKind, WindowOptions, div, layer_shell::*, point, prelude::*, px, rems, rgba, white, }; struct LayerShellExample; diff --git a/crates/gpui/examples/legacy/on_window_close_quit.rs b/crates/gpui/examples/legacy/on_window_close_quit.rs index e91babdb3b..f8afd18d1d 100644 --- a/crates/gpui/examples/legacy/on_window_close_quit.rs +++ b/crates/gpui/examples/legacy/on_window_close_quit.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, FocusHandle, KeyBinding, Window, WindowBounds, - WindowOptions, actions, div, prelude::*, px, rgb, size, + App, Bounds, Context, FocusHandle, KeyBinding, Window, WindowBounds, WindowOptions, actions, + div, prelude::*, px, rgb, size, }; actions!(example, [CloseWindow]); diff --git a/crates/gpui/examples/legacy/opacity.rs b/crates/gpui/examples/legacy/opacity.rs index 6a7c7db7be..6381255a00 100644 --- a/crates/gpui/examples/legacy/opacity.rs +++ b/crates/gpui/examples/legacy/opacity.rs @@ -2,8 +2,8 @@ use std::{fs, path::PathBuf}; use anyhow::Result; use gpui::{ - App, AssetSource, Bounds, BoxShadow, ClickEvent, Context, SharedString, Task, - Window, WindowBounds, WindowOptions, div, hsla, img, point, prelude::*, px, rgb, size, svg, + App, AssetSource, Bounds, BoxShadow, ClickEvent, Context, SharedString, Task, Window, + WindowBounds, WindowOptions, div, hsla, img, point, prelude::*, px, rgb, size, svg, }; struct Assets { diff --git a/crates/gpui/examples/legacy/scrollable.rs b/crates/gpui/examples/legacy/scrollable.rs index 0cf909da3f..ecc0643475 100644 --- a/crates/gpui/examples/legacy/scrollable.rs +++ b/crates/gpui/examples/legacy/scrollable.rs @@ -1,7 +1,4 @@ -use gpui::{ - App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, - size, -}; +use gpui::{App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, size}; struct Scrollable {} diff --git a/crates/gpui/examples/legacy/svg/svg.rs b/crates/gpui/examples/legacy/svg/svg.rs index 82a0d63b50..da59af89f7 100644 --- a/crates/gpui/examples/legacy/svg/svg.rs +++ b/crates/gpui/examples/legacy/svg/svg.rs @@ -3,8 +3,8 @@ use std::path::PathBuf; use anyhow::Result; use gpui::{ - App, AssetSource, Bounds, Context, SharedString, Window, WindowBounds, - WindowOptions, div, prelude::*, px, rgb, size, svg, + App, AssetSource, Bounds, Context, SharedString, Window, WindowBounds, WindowOptions, div, + prelude::*, px, rgb, size, svg, }; struct Assets { diff --git a/crates/gpui/examples/legacy/tab_stop.rs b/crates/gpui/examples/legacy/tab_stop.rs index 076e3da085..9c113ce7eb 100644 --- a/crates/gpui/examples/legacy/tab_stop.rs +++ b/crates/gpui/examples/legacy/tab_stop.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, Div, ElementId, FocusHandle, KeyBinding, SharedString, - Stateful, Window, WindowBounds, WindowOptions, actions, div, prelude::*, px, size, + App, Bounds, Context, Div, ElementId, FocusHandle, KeyBinding, SharedString, Stateful, Window, + WindowBounds, WindowOptions, actions, div, prelude::*, px, size, }; actions!(example, [Tab, TabPrev]); diff --git a/crates/gpui/examples/legacy/tree.rs b/crates/gpui/examples/legacy/tree.rs index 49dbd5510c..6ab4d4a991 100644 --- a/crates/gpui/examples/legacy/tree.rs +++ b/crates/gpui/examples/legacy/tree.rs @@ -2,10 +2,7 @@ //! handle deep hierarchies (even though it cannot just yet!). use std::sync::LazyLock; -use gpui::{ - App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, - size, -}; +use gpui::{App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, size}; struct Tree {} diff --git a/crates/gpui/examples/legacy/uniform_list.rs b/crates/gpui/examples/legacy/uniform_list.rs index 5866e50043..2b30b0cb28 100644 --- a/crates/gpui/examples/legacy/uniform_list.rs +++ b/crates/gpui/examples/legacy/uniform_list.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, - rgb, size, uniform_list, + App, Bounds, Context, Window, WindowBounds, WindowOptions, div, prelude::*, px, rgb, size, + uniform_list, }; struct UniformListExample {} diff --git a/crates/gpui/examples/legacy/window.rs b/crates/gpui/examples/legacy/window.rs index f9b6afdacd..94d2200e7b 100644 --- a/crates/gpui/examples/legacy/window.rs +++ b/crates/gpui/examples/legacy/window.rs @@ -1,6 +1,6 @@ use gpui::{ - App, Bounds, Context, KeyBinding, PromptButton, PromptLevel, Window, WindowBounds, - WindowKind, WindowOptions, actions, div, prelude::*, px, rgb, size, + App, Bounds, Context, KeyBinding, PromptButton, PromptLevel, Window, WindowBounds, WindowKind, + WindowOptions, actions, div, prelude::*, px, rgb, size, }; struct SubWindow { diff --git a/crates/gpui/examples/legacy/window_shadow.rs b/crates/gpui/examples/legacy/window_shadow.rs index d842df56a3..2fc1d618ee 100644 --- a/crates/gpui/examples/legacy/window_shadow.rs +++ b/crates/gpui/examples/legacy/window_shadow.rs @@ -1,8 +1,8 @@ use gpui::{ - App, Bounds, Context, CursorStyle, Decorations, HitboxBehavior, Hsla, MouseButton, - Pixels, Point, ResizeEdge, Size, Window, WindowBackgroundAppearance, WindowBounds, - WindowDecorations, WindowOptions, black, canvas, div, green, point, prelude::*, px, rgb, size, - transparent_black, white, + App, Bounds, Context, CursorStyle, Decorations, HitboxBehavior, Hsla, MouseButton, Pixels, + Point, ResizeEdge, Size, Window, WindowBackgroundAppearance, WindowBounds, WindowDecorations, + WindowOptions, black, canvas, div, green, point, prelude::*, px, rgb, size, transparent_black, + white, }; struct WindowShadow {} diff --git a/crates/gpui_windows/src/window.rs b/crates/gpui_windows/src/window.rs index 8a0e395392..473a9c3541 100644 --- a/crates/gpui_windows/src/window.rs +++ b/crates/gpui_windows/src/window.rs @@ -863,20 +863,22 @@ impl PlatformWindow for WindowsWindow { let is_visible = unsafe { IsWindowVisible(self.0.hwnd).as_bool() }; if !is_visible { if let Some(mut status) = self.state.initial_placement.take() { - status.state = WindowOpenState::Maximized; - self.state.initial_placement.set(Some(status)); + status.state = WindowOpenState::Maximized; + self.state.initial_placement.set(Some(status)); } return; } let window_operation = if self.is_maximized() { - SW_RESTORE - } - else - { - SW_MAXIMIZE + SW_RESTORE + } else { + SW_MAXIMIZE }; - unsafe { ShowWindowAsync(self.0.hwnd, window_operation).ok().log_err(); } + unsafe { + ShowWindowAsync(self.0.hwnd, window_operation) + .ok() + .log_err(); + } } fn toggle_fullscreen(&self) {