Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
self, Align, Border, CacheOption, ConstrainedBox, Container, Element, Image, ParentElement,
|
||||
Text,
|
||||
@@ -7,10 +7,10 @@ use warpui::{
|
||||
};
|
||||
|
||||
use super::red_notification_dot::RedNotificationDot;
|
||||
use warp_core::ui::{external_product_icon::ExternalProductIcon, icons::Icon};
|
||||
use galaxy_core::ui::{external_product_icon::ExternalProductIcon, icons::Icon};
|
||||
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warpui::elements::{ChildAnchor, OffsetPositioning, ParentAnchor, ParentOffsetBounds, Stack};
|
||||
use galaxyui::elements::{ChildAnchor, OffsetPositioning, ParentAnchor, ParentOffsetBounds, Stack};
|
||||
|
||||
pub enum AvatarContent {
|
||||
/// Rendered as capital initial of the given display name.
|
||||
|
||||
@@ -1 +1 @@
|
||||
pub use warp_core::ui::theme::color::internal_colors::*;
|
||||
pub use galaxy_core::ui::theme::color::internal_colors::*;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use std::fmt::Debug;
|
||||
|
||||
use itertools::{Itertools, Position};
|
||||
use warpui::{
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
CrossAxisAlignment, Flex, Hoverable, MainAxisSize, MouseStateHandle, ParentElement,
|
||||
Shrinkable,
|
||||
|
||||
@@ -3,10 +3,10 @@ use super::{blended_colors, BORDER_RADIUS};
|
||||
use crate::appearance::Appearance;
|
||||
use crate::themes::theme::Fill;
|
||||
use crate::themes::theme::WarpTheme;
|
||||
use warpui::elements::Radius;
|
||||
use warpui::elements::{CornerRadius, MouseStateHandle};
|
||||
use warpui::ui_components::button::Button;
|
||||
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
use galaxyui::elements::Radius;
|
||||
use galaxyui::elements::{CornerRadius, MouseStateHandle};
|
||||
use galaxyui::ui_components::button::Button;
|
||||
use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
|
||||
|
||||
const ICON_BUTTON_PADDING: f32 = 4.;
|
||||
|
||||
@@ -130,7 +130,7 @@ pub fn combo_inner_button(
|
||||
Some(combo_inner_button_styles(theme, ButtonState::Pressed)),
|
||||
Some(combo_inner_button_styles(theme, ButtonState::Disabled)),
|
||||
)
|
||||
.with_icon_label(icon.to_warpui_icon(theme.foreground()));
|
||||
.with_icon_label(icon.to_galaxyui_icon(theme.foreground()));
|
||||
|
||||
if active {
|
||||
return button.active();
|
||||
@@ -163,7 +163,7 @@ fn icon_button_internal(
|
||||
button_styles.clicked_styles,
|
||||
button_styles.disabled_styles,
|
||||
)
|
||||
.with_icon_label(icon.to_warpui_icon(color.unwrap_or(icon_color(theme, mode))));
|
||||
.with_icon_label(icon.to_galaxyui_icon(color.unwrap_or(icon_color(theme, mode))));
|
||||
|
||||
if let Some(color) = color.take() {
|
||||
// We also need to set the font color here to get the button to be colored correctly.
|
||||
|
||||
@@ -2,13 +2,13 @@ use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use ui_components::tooltip::{Params as TooltipParams, Tooltip as TooltipComponent};
|
||||
use ui_components::{Component as _, Options as ComponentOptions};
|
||||
use warp_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill as ThemeFill};
|
||||
use galaxyui::elements::{
|
||||
Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, Element, Hoverable,
|
||||
MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius,
|
||||
Stack,
|
||||
};
|
||||
use warpui::platform::Cursor;
|
||||
use galaxyui::platform::Cursor;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::ui_components::icons::Icon;
|
||||
@@ -40,7 +40,7 @@ pub(crate) fn render_color_dot(
|
||||
) -> Hoverable {
|
||||
Hoverable::new(mouse_state, move |state| {
|
||||
let overlay: Option<Box<dyn Element>> = if is_no_color {
|
||||
Some(Icon::SlashCircle.to_warpui_icon(foreground_color).finish())
|
||||
Some(Icon::SlashCircle.to_galaxyui_icon(foreground_color).finish())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
@@ -81,7 +81,7 @@ fn render_dot_element(
|
||||
ring_color: ColorU,
|
||||
overlay: Option<Box<dyn Element>>,
|
||||
) -> Box<dyn Element> {
|
||||
let dot = ConstrainedBox::new(Icon::Ellipse.to_warpui_icon(dot_color.into()).finish())
|
||||
let dot = ConstrainedBox::new(Icon::Ellipse.to_galaxyui_icon(dot_color.into()).finish())
|
||||
.with_width(COLOR_DOT_SIZE)
|
||||
.with_height(COLOR_DOT_SIZE)
|
||||
.finish();
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
use super::blended_colors;
|
||||
use crate::appearance::Appearance;
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Dismiss, Element, Flex,
|
||||
MainAxisAlignment, MainAxisSize, ParentElement, Shrinkable, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
|
||||
const DIALOG_PADDING: f32 = 20.;
|
||||
|
||||
@@ -32,10 +32,10 @@ pub fn dialog_styles(appearance: &Appearance) -> UiComponentStyles {
|
||||
font_family_id: Some(appearance.header_font_family()),
|
||||
font_size: Some(16.),
|
||||
font_color: Some(blended_colors::text_main(theme, background)),
|
||||
font_weight: Some(warpui::fonts::Weight::Bold),
|
||||
font_weight: Some(galaxyui::fonts::Weight::Bold),
|
||||
background: Some(background.into()),
|
||||
border_color: Some(theme.surface_3().into()),
|
||||
border_radius: Some(CornerRadius::with_all(warpui::elements::Radius::Pixels(8.))),
|
||||
border_radius: Some(CornerRadius::with_all(galaxyui::elements::Radius::Pixels(8.))),
|
||||
border_width: Some(1.),
|
||||
..Default::default()
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warp_core::ui::icons::Icon as WarpIcon;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warp_core::ui::theme::{Fill as WarpThemeFill, WarpTheme};
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::icons::Icon as WarpIcon;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::theme::{Fill as WarpThemeFill, WarpTheme};
|
||||
use galaxyui::elements::{
|
||||
ChildAnchor, ConstrainedBox, Container, CornerRadius, Element, OffsetPositioning, ParentAnchor,
|
||||
ParentElement, ParentOffsetBounds, Radius, Stack,
|
||||
};
|
||||
@@ -58,7 +58,7 @@ pub(crate) fn render_icon_with_status(
|
||||
|
||||
match variant {
|
||||
IconWithStatusVariant::Neutral { icon, icon_color } => {
|
||||
let inner = ConstrainedBox::new(icon.to_warpui_icon(icon_color).finish())
|
||||
let inner = ConstrainedBox::new(icon.to_galaxyui_icon(icon_color).finish())
|
||||
.with_width(sizing.icon_size)
|
||||
.with_height(sizing.icon_size)
|
||||
.finish();
|
||||
@@ -90,7 +90,7 @@ pub(crate) fn render_icon_with_status(
|
||||
WarpIcon::Oz
|
||||
};
|
||||
let inner = ConstrainedBox::new(
|
||||
icon.to_warpui_icon(theme.main_text_color(theme.background()))
|
||||
icon.to_galaxyui_icon(theme.main_text_color(theme.background()))
|
||||
.finish(),
|
||||
)
|
||||
.with_width(sizing.icon_size)
|
||||
@@ -119,10 +119,10 @@ pub(crate) fn render_icon_with_status(
|
||||
let icon_element = agent
|
||||
.icon()
|
||||
.map(|icon| {
|
||||
icon.to_warpui_icon(WarpThemeFill::Solid(icon_color))
|
||||
icon.to_galaxyui_icon(WarpThemeFill::Solid(icon_color))
|
||||
.finish()
|
||||
})
|
||||
.unwrap_or_else(|| WarpIcon::Terminal.to_warpui_icon(sub_text).finish());
|
||||
.unwrap_or_else(|| WarpIcon::Terminal.to_galaxyui_icon(sub_text).finish());
|
||||
let inner = ConstrainedBox::new(icon_element)
|
||||
.with_width(sizing.icon_size)
|
||||
.with_height(sizing.icon_size)
|
||||
@@ -157,7 +157,7 @@ fn render_with_optional_status_badge(
|
||||
return circle;
|
||||
};
|
||||
let (icon, color) = status.status_icon_and_color(theme);
|
||||
let badge_icon = ConstrainedBox::new(icon.to_warpui_icon(WarpThemeFill::Solid(color)).finish())
|
||||
let badge_icon = ConstrainedBox::new(icon.to_galaxyui_icon(WarpThemeFill::Solid(color)).finish())
|
||||
.with_width(sizing.badge_icon_size)
|
||||
.with_height(sizing.badge_icon_size)
|
||||
.finish();
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
use crate::ui_components::blended_colors;
|
||||
use crate::{appearance::Appearance, ui_components::icons::Icon};
|
||||
use pathfinder_color::ColorU;
|
||||
use warp_core::ui::theme::color::internal_colors;
|
||||
use warp_core::ui::theme::Fill;
|
||||
use warpui::elements::{CornerRadius, MouseState, Radius};
|
||||
use warpui::Element;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxyui::elements::{CornerRadius, MouseState, Radius};
|
||||
use galaxyui::Element;
|
||||
|
||||
/// Shared item highlight state for left-panel style lists (file tree, global search results,
|
||||
/// warp drive rows, etc.).
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use crate::appearance::Appearance;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use warpui::elements::{
|
||||
use galaxyui::elements::{
|
||||
ChildAnchor, ChildView, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
|
||||
ParentOffsetBounds, Stack,
|
||||
};
|
||||
use warpui::platform::Cursor;
|
||||
use warpui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
use warpui::{AppContext, Element, EventContext, View, ViewHandle};
|
||||
use galaxyui::platform::Cursor;
|
||||
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
|
||||
use galaxyui::{AppContext, Element, EventContext, View, ViewHandle};
|
||||
|
||||
use super::buttons::{highlight, icon_button};
|
||||
use super::icons::Icon;
|
||||
@@ -104,7 +104,7 @@ where
|
||||
{
|
||||
let button = icon_button(appearance, icon, is_menu_open, mouse_state_handle)
|
||||
.with_hovered_styles(
|
||||
warpui::ui_components::components::UiComponentStyles::default()
|
||||
galaxyui::ui_components::components::UiComponentStyles::default()
|
||||
.set_background(appearance.theme().surface_1().into())
|
||||
.set_border_color(appearance.theme().surface_3().into()),
|
||||
)
|
||||
@@ -141,7 +141,7 @@ where
|
||||
appearance,
|
||||
)
|
||||
.with_hovered_styles(
|
||||
warpui::ui_components::components::UiComponentStyles::default()
|
||||
galaxyui::ui_components::components::UiComponentStyles::default()
|
||||
.set_background(appearance.theme().surface_1().into())
|
||||
.set_border_color(appearance.theme().surface_3().into()),
|
||||
);
|
||||
|
||||
@@ -16,6 +16,6 @@ pub(crate) mod render_file_search_row;
|
||||
pub mod tab_selector;
|
||||
pub(crate) mod window_focus_dimming;
|
||||
|
||||
pub use warp_core::ui::icons;
|
||||
pub use galaxy_core::ui::icons;
|
||||
|
||||
const BORDER_RADIUS: f32 = 4.;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::appearance::Appearance;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use warp_core::ui::theme::AnsiColorIdentifier;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::theme::AnsiColorIdentifier;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
ChildAnchor, ConstrainedBox, Container, CornerRadius, Empty, Fill, OffsetPositioning,
|
||||
ParentAnchor, ParentElement as _, ParentOffsetBounds, Radius, Stack,
|
||||
|
||||
@@ -13,18 +13,18 @@
|
||||
|
||||
use fuzzy_match::FuzzyMatchResult;
|
||||
use std::path::Path;
|
||||
use warp_core::ui::theme::Fill;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::theme::Fill;
|
||||
use galaxyui::elements::{
|
||||
Container, CrossAxisAlignment, Flex, Highlight, MainAxisSize, ParentElement, Shrinkable, Text,
|
||||
};
|
||||
use warpui::fonts::{Properties, Weight};
|
||||
use warpui::text_layout::ClipConfig;
|
||||
use warpui::{AppContext, Element};
|
||||
use galaxyui::fonts::{Properties, Weight};
|
||||
use galaxyui::text_layout::ClipConfig;
|
||||
use galaxyui::{AppContext, Element};
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::search::ai_context_menu::safe_truncate;
|
||||
use crate::search::ItemHighlightState;
|
||||
use warpui::SingletonEntity;
|
||||
use galaxyui::SingletonEntity;
|
||||
|
||||
pub const MAX_COMBINED_LENGTH: usize = 55;
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use warp_core::ui::appearance::Appearance;
|
||||
use warpui::{
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, Container, CrossAxisAlignment, Element, Empty, Fill, Flex, MouseStateHandle,
|
||||
ParentElement,
|
||||
@@ -36,7 +36,7 @@ pub fn render_tab_selector<F>(
|
||||
where
|
||||
// The on select function will take in the click event context and the selected label,
|
||||
// and will then presumably change the passed in selected label.
|
||||
F: Fn(&str, &mut warpui::EventContext) + 'static + Clone,
|
||||
F: Fn(&str, &mut galaxyui::EventContext) + 'static + Clone,
|
||||
{
|
||||
let mut tabs_row = Flex::row()
|
||||
.with_spacing(12.)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use warp_core::ui::color::coloru_with_opacity;
|
||||
use warpui::elements::{
|
||||
use galaxy_core::ui::color::coloru_with_opacity;
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Element, Fill, Hoverable, MouseStateHandle, ParentElement, Rect, Stack,
|
||||
};
|
||||
use warpui::windowing::WindowManager;
|
||||
use warpui::{AppContext, SingletonEntity, WindowId};
|
||||
use galaxyui::windowing::WindowManager;
|
||||
use galaxyui::{AppContext, SingletonEntity, WindowId};
|
||||
|
||||
use crate::window_settings::WindowSettings;
|
||||
use crate::workspace::panel_header_corner_radius;
|
||||
@@ -23,7 +23,7 @@ impl WindowFocusDimming {
|
||||
/// unreliable due to soft keyboard management.
|
||||
pub fn is_window_focused(window_id: WindowId, ctx: &AppContext) -> bool {
|
||||
#[cfg(target_family = "wasm")]
|
||||
if warpui::platform::wasm::is_mobile_device() {
|
||||
if galaxyui::platform::wasm::is_mobile_device() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ impl WindowFocusDimming {
|
||||
element: Box<dyn Element>,
|
||||
mouse_state: MouseStateHandle,
|
||||
height: f32,
|
||||
background_color: warpui::color::ColorU,
|
||||
background_color: galaxyui::color::ColorU,
|
||||
window_id: WindowId,
|
||||
ctx: &AppContext,
|
||||
) -> Box<dyn Element> {
|
||||
|
||||
Reference in New Issue
Block a user