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
+38 -45
View File
@@ -1,55 +1,48 @@
use pathfinder_color::ColorU;
use settings::Setting as _;
use galaxy_editor::editor::NavigationKey;
use galaxyui::accessibility::{AccessibilityContent, WarpA11yRole};
use galaxyui::elements::{
Align, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
DispatchEventResult, Element, Empty, EventHandler, Fill, Flex, Hoverable, Icon,
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, Rect, SavePosition, ScrollStateHandle, Scrollable,
ScrollableElement, ScrollbarWidth, Shrinkable, Stack, Text, UniformList, UniformListState,
};
use galaxyui::fonts::{FamilyId, Weight};
use galaxyui::geometry::vector::vec2f;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::{Cursor, SystemTheme};
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::windowing::{StateEvent, WindowManager};
use galaxyui::{
accessibility::{AccessibilityContent, GalaxyA11yRole},
elements::{
Align, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
DispatchEventResult, Element, Empty, EventHandler, Fill, Flex, Hoverable, Icon,
MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, Rect, SavePosition, ScrollStateHandle,
Scrollable, ScrollableElement, ScrollbarWidth, Shrinkable, Stack, Text, UniformList,
UniformListState,
},
fonts::{FamilyId, Weight},
geometry::vector::vec2f,
keymap::FixedBinding,
platform::{Cursor, SystemTheme},
ui_components::components::{UiComponent, UiComponentStyles},
windowing::{StateEvent, WindowManager},
AppContext, Entity, FocusContext, ModelHandle, SingletonEntity, Tracked, TypedActionView,
UpdateModel, View, ViewContext, ViewHandle,
};
use pathfinder_color::ColorU;
use settings::Setting as _;
use crate::resource_center::{mark_feature_used_and_write_to_user_defaults, Tip, TipAction};
use crate::themes::theme::{GalaxyTheme, RespectSystemTheme, ThemeKind};
use crate::util::traffic_lights::traffic_light_data;
use crate::workspace::PANEL_HEADER_HEIGHT;
use crate::{
appearance::Appearance,
editor::{
Event as EditorEvent, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions, TextOptions,
},
referral_theme_status::ReferralThemeStatus,
report_if_error,
settings::{respect_system_theme, ThemeSettings},
themes::theme::SelectedSystemThemes,
user_config::{load_theme_configs, themes_dir, GalaxyConfig, GalaxyConfigUpdateEvent},
util::traffic_lights::{TrafficLightData, TrafficLightSide},
window_settings::WindowSettings,
};
use crate::{appearance::AppearanceManager, send_telemetry_from_ctx};
use crate::{editor::EditorView, resource_center::TipsCompleted};
use crate::{
server::telemetry::TelemetryEvent, ui_components::window_focus_dimming::WindowFocusDimming,
};
use crate::{
themes::theme::GalaxyThemeConfig,
ui_components::buttons::{close_button, icon_button},
ui_components::icons,
};
use super::theme;
use crate::appearance::{Appearance, AppearanceManager};
use crate::editor::{
EditorView, Event as EditorEvent, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions,
TextOptions,
};
use crate::referral_theme_status::ReferralThemeStatus;
use crate::resource_center::{
mark_feature_used_and_write_to_user_defaults, Tip, TipAction, TipsCompleted,
};
use crate::server::telemetry::TelemetryEvent;
use crate::settings::{respect_system_theme, ThemeSettings};
use crate::themes::theme::{
RespectSystemTheme, SelectedSystemThemes, ThemeKind, WarpTheme, WarpThemeConfig,
};
use crate::ui_components::buttons::{close_button, icon_button};
use crate::ui_components::icons;
use crate::ui_components::window_focus_dimming::WindowFocusDimming;
use crate::user_config::{load_theme_configs, themes_dir, WarpConfig, WarpConfigUpdateEvent};
use crate::util::traffic_lights::{traffic_light_data, TrafficLightData, TrafficLightSide};
use crate::window_settings::WindowSettings;
use crate::workspace::PANEL_HEADER_HEIGHT;
use crate::{report_if_error, send_telemetry_from_ctx};
// All units in px
const THEME_CHOOSER_TITLE: &str = "Themes";