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

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
+18 -16
View File
@@ -1,23 +1,25 @@
use std::borrow::Cow;
use galaxy_core::{
features::FeatureFlag,
ui::{appearance::Appearance, color::blend::Blend as _, theme::color::internal_colors, Icon},
};
use galaxyui::{
elements::{
ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow,
Expanded, Flex, Hoverable, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement as _, ParentOffsetBounds, Radius, Stack,
},
fonts::Weight,
keymap::EditableBinding,
platform::{file_picker::FilePickerError, Cursor, FilePickerConfiguration},
ui_components::components::{UiComponent as _, UiComponentStyles},
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::Vector2F;
use galaxy_core::features::FeatureFlag;
use galaxy_core::ui::appearance::Appearance;
use galaxy_core::ui::color::blend::Blend as _;
use galaxy_core::ui::theme::color::internal_colors;
use galaxy_core::ui::Icon;
use galaxyui::elements::{
ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow, Expanded,
Flex, Hoverable, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement as _,
ParentOffsetBounds, Radius, Stack,
};
use galaxyui::fonts::Weight;
use galaxyui::keymap::EditableBinding;
use galaxyui::platform::file_picker::FilePickerError;
use galaxyui::platform::{Cursor, FilePickerConfiguration};
use galaxyui::ui_components::components::{UiComponent as _, UiComponentStyles};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
use crate::util::bindings::{keybinding_name_to_display_string, BindingGroup, CustomAction};