Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
+22
-22
@@ -33,11 +33,11 @@ use crate::BlocklistAIHistoryModel;
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use warp_core::context_flag::ContextFlag;
|
||||
use warp_core::ui::builder::UiBuilder;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warp_core::ui::theme::AnsiColors;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::context_flag::ContextFlag;
|
||||
use galaxy_core::ui::builder::UiBuilder;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::theme::AnsiColors;
|
||||
use galaxyui::elements::{
|
||||
Align, Border, ChildAnchor, Clipped, ConstrainedBox, Container, CornerRadius,
|
||||
CrossAxisAlignment, DragAxis, Draggable, DraggableState, DropTarget, Element, Empty, Fill,
|
||||
Flex, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, Padding,
|
||||
@@ -45,11 +45,11 @@ use warpui::elements::{
|
||||
PositionedElementOffsetBounds, Radius, Rect, SavePosition, Shrinkable, SizeConstraintCondition,
|
||||
SizeConstraintSwitch, Stack, Text,
|
||||
};
|
||||
use warpui::fonts::Weight;
|
||||
use warpui::text_layout::ClipConfig;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use warpui::ui_components::text_input::TextInput;
|
||||
use warpui::{AppContext, SingletonEntity, ViewHandle};
|
||||
use galaxyui::fonts::Weight;
|
||||
use galaxyui::text_layout::ClipConfig;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::ui_components::text_input::TextInput;
|
||||
use galaxyui::{AppContext, SingletonEntity, ViewHandle};
|
||||
|
||||
pub const TAB_BAR_BORDER_HEIGHT: f32 = 1.0;
|
||||
const TAB_INDICATOR_HEIGHT: f32 = 14.0;
|
||||
@@ -1082,22 +1082,22 @@ impl<'a> TabComponent<'a> {
|
||||
Indicator::None => None,
|
||||
Indicator::Synced => Some(
|
||||
Icon::LinkHorizontal
|
||||
.to_warpui_icon(self.styles.synced_input_indicator_color.into())
|
||||
.to_galaxyui_icon(self.styles.synced_input_indicator_color.into())
|
||||
.finish(),
|
||||
),
|
||||
Indicator::Error => Some(
|
||||
Icon::AlertTriangle
|
||||
.to_warpui_icon(self.styles.error_color.into())
|
||||
.to_galaxyui_icon(self.styles.error_color.into())
|
||||
.finish(),
|
||||
),
|
||||
Indicator::Shared => Some(
|
||||
Icon::Sharing
|
||||
.to_warpui_icon(self.styles.sharing_color.into())
|
||||
.to_galaxyui_icon(self.styles.sharing_color.into())
|
||||
.finish(),
|
||||
),
|
||||
Indicator::Maximized => Some(
|
||||
Icon::Maximize
|
||||
.to_warpui_icon(
|
||||
.to_galaxyui_icon(
|
||||
self.styles
|
||||
.default
|
||||
.font_color
|
||||
@@ -1109,7 +1109,7 @@ impl<'a> TabComponent<'a> {
|
||||
Indicator::Shell(shell_indicator_type) => Some(
|
||||
shell_indicator_type
|
||||
.to_icon()
|
||||
.to_warpui_icon(internal_colors::neutral_5(self.appearance.theme()).into())
|
||||
.to_galaxyui_icon(internal_colors::neutral_5(self.appearance.theme()).into())
|
||||
.finish(),
|
||||
),
|
||||
Indicator::Agent {
|
||||
@@ -1124,7 +1124,7 @@ impl<'a> TabComponent<'a> {
|
||||
}
|
||||
} else {
|
||||
let icon_color = self.appearance.theme().nonactive_ui_text_color();
|
||||
Some(Icon::Oz.to_warpui_icon(icon_color).finish())
|
||||
Some(Icon::Oz.to_galaxyui_icon(icon_color).finish())
|
||||
}
|
||||
}
|
||||
Indicator::AmbientAgent => {
|
||||
@@ -1139,7 +1139,7 @@ impl<'a> TabComponent<'a> {
|
||||
Some(
|
||||
Hoverable::new(mouse_state, move |state| {
|
||||
let mut stack = Stack::new()
|
||||
.with_child(Icon::OzCloud.to_warpui_icon(icon_color.into()).finish());
|
||||
.with_child(Icon::OzCloud.to_galaxyui_icon(icon_color.into()).finish());
|
||||
|
||||
if state.is_hovered() {
|
||||
let tooltip = ui_builder
|
||||
@@ -1264,7 +1264,7 @@ impl<'a> TabComponent<'a> {
|
||||
let mut flex_row = Flex::row()
|
||||
.with_main_axis_size(MainAxisSize::Max)
|
||||
.with_main_axis_alignment(MainAxisAlignment::Center)
|
||||
.with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Center);
|
||||
.with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Center);
|
||||
if let Some(indicator) = self.render_indicator() {
|
||||
flex_row.add_child(indicator);
|
||||
}
|
||||
@@ -1287,7 +1287,7 @@ impl<'a> TabComponent<'a> {
|
||||
} else {
|
||||
// Fallback to terminal icon if no indicator is present
|
||||
Icon::Terminal
|
||||
.to_warpui_icon(
|
||||
.to_galaxyui_icon(
|
||||
self.styles
|
||||
.default
|
||||
.font_color
|
||||
@@ -1301,7 +1301,7 @@ impl<'a> TabComponent<'a> {
|
||||
Flex::row()
|
||||
.with_main_axis_size(MainAxisSize::Max)
|
||||
.with_main_axis_alignment(MainAxisAlignment::Center)
|
||||
.with_cross_axis_alignment(warpui::elements::CrossAxisAlignment::Center)
|
||||
.with_cross_axis_alignment(galaxyui::elements::CrossAxisAlignment::Center)
|
||||
.with_child(
|
||||
ConstrainedBox::new(compact_icon)
|
||||
.with_max_width(TAB_INDICATOR_HEIGHT)
|
||||
@@ -1515,7 +1515,7 @@ impl UiComponent for TabComponent<'_> {
|
||||
|
||||
if let Some(directory) = &tooltip_directory_clone {
|
||||
let folder_icon = Icon::Folder
|
||||
.to_warpui_icon(ThemeFill::Solid(font_color))
|
||||
.to_galaxyui_icon(ThemeFill::Solid(font_color))
|
||||
.finish();
|
||||
|
||||
let directory_row = Flex::row()
|
||||
@@ -1548,7 +1548,7 @@ impl UiComponent for TabComponent<'_> {
|
||||
|
||||
if let Some(branch) = &tooltip_git_branch_clone {
|
||||
let branch_icon = Icon::GitBranch
|
||||
.to_warpui_icon(ThemeFill::Solid(font_color))
|
||||
.to_galaxyui_icon(ThemeFill::Solid(font_color))
|
||||
.finish();
|
||||
|
||||
let branch_row = Flex::row()
|
||||
|
||||
Reference in New Issue
Block a user