first pass of merging in warp (doesn't build)
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
use crate::coding_entrypoints::glowing_editor::{GlowingEditor, GlowingEditorEvent};
|
||||
use crate::TelemetryEvent;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxyui::elements::{ChildView, Flex, ParentElement as _};
|
||||
use galaxyui::{
|
||||
elements::{ChildView, Flex, ParentElement as _},
|
||||
AppContext, Element, Entity, FocusContext, TypedActionView, View, ViewContext, ViewHandle,
|
||||
};
|
||||
|
||||
use crate::coding_entrypoints::glowing_editor::{GlowingEditor, GlowingEditorEvent};
|
||||
use crate::TelemetryEvent;
|
||||
|
||||
pub struct CloneRepoView {
|
||||
editor: ViewHandle<GlowingEditor>,
|
||||
is_ftux: bool,
|
||||
|
||||
@@ -1,20 +1,21 @@
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
use warpui::elements::{
|
||||
ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Expanded, Fill, Flex,
|
||||
Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement as _, Radius, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::platform::Cursor;
|
||||
use warpui::{
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity as _, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
|
||||
use crate::ai::blocklist::telemetry_banner::should_collect_ai_ugc_telemetry;
|
||||
use crate::appearance::Appearance;
|
||||
use crate::coding_entrypoints::glowing_editor::{GlowingEditor, GlowingEditorEvent};
|
||||
use crate::settings::PrivacySettings;
|
||||
use crate::TelemetryEvent;
|
||||
use galaxy_core::{send_telemetry_from_ctx, ui::icons::Icon};
|
||||
use galaxyui::elements::{ChildView, Expanded, Fill, MainAxisAlignment, MainAxisSize};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
|
||||
MouseStateHandle, ParentElement as _, Radius, Text,
|
||||
},
|
||||
fonts::{Properties, Weight},
|
||||
platform::Cursor,
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity as _, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
|
||||
const ICON_MARGIN_LEFT: f32 = 12.;
|
||||
const ICON_MARGIN_RIGHT: f32 = 8.;
|
||||
|
||||
@@ -1,16 +1,17 @@
|
||||
use galaxy_core::ui::{appearance::Appearance, Icon};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::Icon;
|
||||
use galaxyui::elements::{
|
||||
Align, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow, Flex,
|
||||
MainAxisAlignment, ParentElement as _, Radius, Shrinkable,
|
||||
};
|
||||
use galaxyui::fonts::Weight;
|
||||
use galaxyui::ui_components::components::{BorderStyle, Coords, UiComponent as _, UiComponentStyles};
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Align, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow, Flex,
|
||||
MainAxisAlignment, ParentElement as _, Radius, Shrinkable,
|
||||
},
|
||||
fonts::Weight,
|
||||
ui_components::components::{BorderStyle, Coords, UiComponent as _, UiComponentStyles},
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity as _, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::Vector2F;
|
||||
|
||||
use crate::editor::{EditorOptions, EditorView, Event as EditorEvent, TextOptions};
|
||||
|
||||
|
||||
@@ -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};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user