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

2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,19 +1,20 @@
 #![cfg_attr(target_family = "wasm", allow(dead_code, unused_imports))]

+use warpui::elements::{
+    Align, Border, ChildView, ConstrainedBox, Container, CornerRadius, DropShadow, Flex,
+    ParentElement, Radius, Text,
+};
+use warpui::{
+    AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
+    ViewHandle,
+};
+
 use crate::appearance::Appearance;
 use crate::code::editor::find::view::{FIND_BAR_PADDING, FIND_EDITOR_BORDER_RADIUS};
 use crate::editor::{
    EditorView, Event as EditorEvent, InteractionState, PropagateAndNoOpNavigationKeys,
    SingleLineEditorOptions, TextOptions,
 };
-use galaxyui::{
-    elements::{
-        Align, Border, ChildView, ConstrainedBox, Container, CornerRadius, DropShadow, Flex,
-        ParentElement, Radius, Text,
-    },
-    AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
-    ViewHandle,
-};

 const GOTO_LINE_WIDTH: f32 = 300.;
 const GOTO_LINE_LABEL_FONT_SIZE: f32 = 12.;