Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -10,8 +10,8 @@ use crate::coding_panel_enablement_state::CodingPanelEnablementState;
|
||||
use async_channel::Sender;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use string_offset::{ByteOffset, CharCounter};
|
||||
use warp_editor::editor::NavigationKey;
|
||||
use warp_ripgrep::search::{Match as RipgrepMatch, Submatch};
|
||||
use galaxy_editor::editor::NavigationKey;
|
||||
use galaxy_ripgrep::search::{Match as RipgrepMatch, Submatch};
|
||||
|
||||
use crate::code::icon_from_file_path;
|
||||
use crate::debounce::debounce;
|
||||
@@ -28,12 +28,12 @@ use crate::view_components::action_button::{ActionButton, ButtonSize, NakedTheme
|
||||
use crate::workspace::view::global_search::model::GlobalSearch;
|
||||
use crate::workspace::view::global_search::SearchConfig;
|
||||
use crate::TelemetryEvent;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warp_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
|
||||
use warp_core::ui::Icon;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
|
||||
use galaxy_core::ui::Icon;
|
||||
use galaxyui::elements::{
|
||||
Border, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, DispatchEventResult, Empty, EventHandler, Fill, Flex, FormattedTextElement,
|
||||
Highlight, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning,
|
||||
@@ -41,13 +41,13 @@ use warpui::elements::{
|
||||
Scrollable, ScrollableElement, ScrollbarWidth, Shrinkable, Stack, Text, UniformList,
|
||||
UniformListState,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::keymap::FixedBinding;
|
||||
use warpui::platform::Cursor;
|
||||
use warpui::text_layout::{TextAlignment, TextStyle};
|
||||
use warpui::ui_components::components::{UiComponent as _, UiComponentStyles};
|
||||
use warpui::ui_components::text::Span;
|
||||
use warpui::{
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::keymap::FixedBinding;
|
||||
use galaxyui::platform::Cursor;
|
||||
use galaxyui::text_layout::{TextAlignment, TextStyle};
|
||||
use galaxyui::ui_components::components::{UiComponent as _, UiComponentStyles};
|
||||
use galaxyui::ui_components::text::Span;
|
||||
use galaxyui::{
|
||||
AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
ViewHandle, WeakViewHandle,
|
||||
};
|
||||
@@ -598,7 +598,7 @@ impl GlobalSearchView {
|
||||
}
|
||||
|
||||
pub fn init(app: &mut AppContext) {
|
||||
use warpui::keymap::macros::*;
|
||||
use galaxyui::keymap::macros::*;
|
||||
|
||||
app.register_fixed_bindings([
|
||||
FixedBinding::new(
|
||||
@@ -984,7 +984,7 @@ impl GlobalSearchView {
|
||||
// Ancestor-dedup search roots so we don't search the same file twice
|
||||
// when terminal directories are nested (e.g. `~/code` + `~/code/a`).
|
||||
// Shared with `FileTreeView` for consistency.
|
||||
self.search_roots = warp_util::path::group_roots_by_common_ancestor(&roots).roots;
|
||||
self.search_roots = galaxy_util::path::group_roots_by_common_ancestor(&roots).roots;
|
||||
self.root_directories = roots;
|
||||
}
|
||||
|
||||
@@ -1074,7 +1074,7 @@ impl GlobalSearchView {
|
||||
directory_path: &Path,
|
||||
matched_path: &MatchedPath,
|
||||
appearance: &Appearance,
|
||||
theme: &warp_core::ui::theme::WarpTheme,
|
||||
theme: &galaxy_core::ui::theme::WarpTheme,
|
||||
app: &AppContext,
|
||||
) -> Box<dyn Element> {
|
||||
let is_selected = self.is_row_at_index_selected(index);
|
||||
@@ -1105,7 +1105,7 @@ impl GlobalSearchView {
|
||||
let icon_size = 16.0;
|
||||
let chevron_color = item_highlight_state.text_and_icon_color(appearance);
|
||||
let chevron_icon = chevron_icon_enum
|
||||
.to_warpui_icon(ThemeFill::from(chevron_color))
|
||||
.to_galaxyui_icon(ThemeFill::from(chevron_color))
|
||||
.finish();
|
||||
let chevron_icon = ConstrainedBox::new(chevron_icon)
|
||||
.with_width(icon_size)
|
||||
@@ -1157,7 +1157,7 @@ impl GlobalSearchView {
|
||||
let icon_color = list_highlight_state.text_and_icon_color(appearance);
|
||||
let file_icon = match icon_from_file_path {
|
||||
ImageOrIcon::Icon(icon) => {
|
||||
icon.to_warpui_icon(ThemeFill::from(icon_color)).finish()
|
||||
icon.to_galaxyui_icon(ThemeFill::from(icon_color)).finish()
|
||||
}
|
||||
ImageOrIcon::Image(image) => image,
|
||||
};
|
||||
@@ -1249,7 +1249,7 @@ impl GlobalSearchView {
|
||||
matched: &Match,
|
||||
match_index: usize,
|
||||
appearance: &Appearance,
|
||||
theme: &warp_core::ui::theme::WarpTheme,
|
||||
theme: &galaxy_core::ui::theme::WarpTheme,
|
||||
) -> Box<dyn Element> {
|
||||
let is_selected = self.is_row_at_index_selected(index);
|
||||
let line_number = matched.line_number;
|
||||
@@ -1853,7 +1853,7 @@ impl GlobalSearchView {
|
||||
index: usize,
|
||||
dir_entry: &DirectoryEntry,
|
||||
appearance: &Appearance,
|
||||
theme: &warp_core::ui::theme::WarpTheme,
|
||||
theme: &galaxy_core::ui::theme::WarpTheme,
|
||||
) -> Box<dyn Element> {
|
||||
let is_selected = self.is_row_at_index_selected(index);
|
||||
let mouse_state = dir_entry.mouse_state.clone();
|
||||
@@ -1883,7 +1883,7 @@ impl GlobalSearchView {
|
||||
let icon_size = 16.0;
|
||||
let chevron_color = list_highlight_state.text_and_icon_color(appearance);
|
||||
let chevron_icon = chevron_icon_enum
|
||||
.to_warpui_icon(ThemeFill::from(chevron_color))
|
||||
.to_galaxyui_icon(ThemeFill::from(chevron_color))
|
||||
.finish();
|
||||
let chevron_icon = ConstrainedBox::new(chevron_icon)
|
||||
.with_width(icon_size)
|
||||
@@ -1894,7 +1894,7 @@ impl GlobalSearchView {
|
||||
// Folder icon
|
||||
let icon_color = list_highlight_state.text_and_icon_color(appearance);
|
||||
let folder_icon = Icon::Folder
|
||||
.to_warpui_icon(ThemeFill::from(icon_color))
|
||||
.to_galaxyui_icon(ThemeFill::from(icon_color))
|
||||
.finish();
|
||||
let folder_icon_element = Container::new(
|
||||
ConstrainedBox::new(folder_icon)
|
||||
@@ -2108,7 +2108,7 @@ impl View for GlobalSearchView {
|
||||
if self.capped_matches {
|
||||
let alert_icon = ConstrainedBox::new(
|
||||
Icon::AlertTriangle
|
||||
.to_warpui_icon(ThemeFill::Solid(
|
||||
.to_galaxyui_icon(ThemeFill::Solid(
|
||||
theme.terminal_colors().normal.yellow.into(),
|
||||
))
|
||||
.finish(),
|
||||
@@ -2184,7 +2184,7 @@ impl GlobalSearchView {
|
||||
.with_child(
|
||||
Container::new(
|
||||
ConstrainedBox::new(
|
||||
icon.to_warpui_icon(ThemeFill::Solid(internal_colors::neutral_6(theme)))
|
||||
icon.to_galaxyui_icon(ThemeFill::Solid(internal_colors::neutral_6(theme)))
|
||||
.finish(),
|
||||
)
|
||||
.with_width(24.)
|
||||
|
||||
Reference in New Issue
Block a user