Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -20,17 +20,17 @@ use num_traits::SaturatingSub;
|
||||
use pathfinder_geometry::{rect::RectF, vector::Vector2F};
|
||||
use string_offset::CharOffset;
|
||||
use vec1::Vec1;
|
||||
use warp_core::{features::FeatureFlag, ui::appearance::Appearance};
|
||||
use warp_editor::{
|
||||
use galaxy_core::{features::FeatureFlag, ui::appearance::Appearance};
|
||||
use galaxy_editor::{
|
||||
content::{buffer::InitialBufferState, text::IndentUnit},
|
||||
render::model::{Decoration, LineCount},
|
||||
};
|
||||
use warp_util::{
|
||||
use galaxy_util::{
|
||||
content_version::ContentVersion,
|
||||
file::{FileId, FileLoadError, FileSaveError},
|
||||
path::to_relative_path,
|
||||
};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ChildAnchor, ChildView, ClippedScrollStateHandle, ConstrainedBox, Container,
|
||||
CornerRadius, CrossAxisAlignment, DropShadow, Flex, Hoverable, MainAxisAlignment,
|
||||
@@ -46,7 +46,7 @@ use warpui::{
|
||||
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
|
||||
WindowId,
|
||||
};
|
||||
use warpui::{platform::SaveFilePickerConfiguration, ModelHandle};
|
||||
use galaxyui::{platform::SaveFilePickerConfiguration, ModelHandle};
|
||||
|
||||
use crate::menu::{Event, Menu, MenuItem, MenuItemFields};
|
||||
|
||||
@@ -71,7 +71,7 @@ use pathfinder_color::ColorU;
|
||||
#[cfg(feature = "local_fs")]
|
||||
use repo_metadata::repositories::DetectedRepositories;
|
||||
use vim::vim::{MotionType, VimMode};
|
||||
use warp_core::ui::icons::Icon;
|
||||
use galaxy_core::ui::icons::Icon;
|
||||
|
||||
use crate::ai::persisted_workspace::{PersistedWorkspace, PersistedWorkspaceEvent};
|
||||
use crate::workspace::WorkspaceAction;
|
||||
@@ -94,7 +94,7 @@ use super::find_references_view::{FindReferencesView, FindReferencesViewEvent};
|
||||
use super::language_server_extension::ProcessedDiagnostic;
|
||||
use super::lsp_telemetry::LspTelemetryEvent;
|
||||
use super::ImmediateSaveError;
|
||||
use warp_core::send_telemetry_from_ctx;
|
||||
use galaxy_core::send_telemetry_from_ctx;
|
||||
|
||||
type SaveCallback =
|
||||
Box<dyn FnOnce(SaveOutcome, &mut ViewContext<LocalCodeEditorView>) + Send + Sync + 'static>;
|
||||
@@ -651,7 +651,7 @@ impl LocalCodeEditorView {
|
||||
let window_id = ctx.window_id();
|
||||
|
||||
// Create the on-click action based on whether we have a definition
|
||||
let on_click: Box<dyn Fn(&mut warpui::AppContext)> = if has_different_definition {
|
||||
let on_click: Box<dyn Fn(&mut galaxyui::AppContext)> = if has_different_definition {
|
||||
let target_location = definition_locations.first().unwrap().target.clone();
|
||||
Box::new(move |app| {
|
||||
app.dispatch_typed_action_for_view(
|
||||
@@ -2081,13 +2081,13 @@ impl View for LocalCodeEditorView {
|
||||
"LocalCodeEditorView"
|
||||
}
|
||||
|
||||
fn on_focus(&mut self, focus_ctx: &warpui::FocusContext, ctx: &mut ViewContext<Self>) {
|
||||
fn on_focus(&mut self, focus_ctx: &galaxyui::FocusContext, ctx: &mut ViewContext<Self>) {
|
||||
if focus_ctx.is_self_focused() {
|
||||
self.editor.update(ctx, |editor, ctx| editor.focus(ctx));
|
||||
}
|
||||
}
|
||||
|
||||
fn render(&self, app: &AppContext) -> Box<dyn warpui::Element> {
|
||||
fn render(&self, app: &AppContext) -> Box<dyn galaxyui::Element> {
|
||||
// Rendering the version conflict banner.
|
||||
let base: Box<dyn Element> = if self.has_version_conflicts(app) {
|
||||
let appearance = Appearance::as_ref(app);
|
||||
@@ -2284,7 +2284,7 @@ pub fn render_unsaved_changes_banner(
|
||||
Container::new(
|
||||
ConstrainedBox::new(
|
||||
Icon::Warning
|
||||
.to_warpui_icon(appearance.theme().active_ui_text_color())
|
||||
.to_galaxyui_icon(appearance.theme().active_ui_text_color())
|
||||
.finish(),
|
||||
)
|
||||
.with_height(16.)
|
||||
|
||||
Reference in New Issue
Block a user