first pass of merging in warp (doesn't build)

app/src/code_review/diff_selector.rs

@@ -1,34 +1,27 @@
 //! Trigger button + [`CodeReviewDiffMenu`] overlay for picking the diff
 //! target in the code review header.
+use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{
+    ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element,
+    Flex, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds,
+    Radius, Stack, Text,
+};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::keymap::FixedBinding;
+use galaxyui::platform::Cursor;
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::ui_components::button::ButtonVariant;
+use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 use galaxyui::{
-    elements::{
-        ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
-        Element, Flex, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
-        ParentOffsetBounds, Radius, Stack, Text,
-    },
-    fonts::{Properties, Weight},
-    id,
-    keymap::FixedBinding,
-    platform::Cursor,
-    text_layout::ClipConfig,
-    ui_components::{
-        button::ButtonVariant,
-        components::{Coords, UiComponent, UiComponentStyles},
-    },
-    AppContext, Entity, FocusContext, SingletonEntity as _, TypedActionView, View, ViewContext,
+    id, AppContext, Entity, FocusContext, SingletonEntity as _, TypedActionView, View, ViewContext,
     ViewHandle,
 };
-use pathfinder_geometry::vector::vec2f;
 
-use crate::{
-    appearance::Appearance,
-    code_review::{
-        diff_menu::{CodeReviewDiffMenu, CodeReviewDiffMenuEvent},
-        diff_state::DiffMode,
-    },
-    ui_components::icons::Icon,
-};
+use crate::appearance::Appearance;
+use crate::code_review::diff_menu::{CodeReviewDiffMenu, CodeReviewDiffMenuEvent};
+use crate::code_review::diff_state::DiffMode;
+use crate::ui_components::icons::Icon;
 
 /// A single selectable target in the diff selector menu.
 #[derive(Debug, Clone)]