Wrapping up bedrock implementation
This commit is contained in:
@@ -1,6 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use std::{borrow::Cow, sync::Arc};
|
||||
use galaxy_core::ui::{
|
||||
appearance::Appearance,
|
||||
color::{coloru_with_opacity, contrast::MinimumAllowedContrast, ContrastingColor},
|
||||
@@ -21,6 +18,9 @@ use galaxyui::{
|
||||
AppContext, BlurContext, Element, Entity, EventContext, FocusContext, SingletonEntity as _,
|
||||
TypedActionView, View, ViewContext,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::{vec2f, Vector2F};
|
||||
use std::{borrow::Cow, sync::Arc};
|
||||
|
||||
use crate::{
|
||||
settings_view::keybindings::{KeybindingChangedEvent, KeybindingChangedNotifier},
|
||||
@@ -820,7 +820,9 @@ impl View for ActionButton {
|
||||
row.add_child(
|
||||
Container::new(
|
||||
ConstrainedBox::new(
|
||||
Icon::ChevronDown.to_galaxyui_icon(text_color.into()).finish(),
|
||||
Icon::ChevronDown
|
||||
.to_galaxyui_icon(text_color.into())
|
||||
.finish(),
|
||||
)
|
||||
.with_width(icon_size)
|
||||
.with_height(icon_size)
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
use std::time::Duration;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use uuid::Uuid;
|
||||
use galaxyui::elements::{DropShadow, Expanded};
|
||||
use galaxyui::r#async::Timer;
|
||||
use galaxyui::WindowId;
|
||||
@@ -18,6 +15,9 @@ use galaxyui::{
|
||||
ui_components::components::{Coords, UiComponent, UiComponentStyles},
|
||||
AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::settings_view::keybindings::{KeybindingChangedEvent, KeybindingChangedNotifier};
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
@@ -8,6 +7,7 @@ use galaxyui::{
|
||||
ui_components::components::{UiComponent, UiComponentStyles},
|
||||
Element,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::{appearance::Appearance, themes::theme::Fill};
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxy_core::ui::theme::{phenomenon::PhenomenonStyle, Fill};
|
||||
use galaxyui::elements::{
|
||||
Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, MainAxisSize,
|
||||
@@ -7,6 +6,7 @@ use galaxyui::elements::{
|
||||
use galaxyui::ui_components::checkbox::Checkbox;
|
||||
use galaxyui::ui_components::components::UiComponentStyles;
|
||||
use galaxyui::Element;
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::ui_components::icons::Icon;
|
||||
|
||||
@@ -5,7 +5,6 @@ use crate::{
|
||||
themes::theme::Fill,
|
||||
ui_components::icons::Icon,
|
||||
};
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ChildAnchor, ConstrainedBox, CornerRadius, CrossAxisAlignment, Flex,
|
||||
@@ -20,6 +19,7 @@ use galaxyui::{
|
||||
Action, AppContext, BlurContext, Element, Entity, SingletonEntity, TypedActionView, View,
|
||||
ViewContext, ViewHandle,
|
||||
};
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "compact_dropdown_tests.rs"]
|
||||
@@ -129,8 +129,9 @@ impl<A: Action + Clone> CompactDropdown<A> {
|
||||
let icon_color = fields
|
||||
.override_icon_color()
|
||||
.unwrap_or_else(|| appearance.theme().active_ui_text_color());
|
||||
button_label
|
||||
.add_child(self.render_sized_icon(appearance, icon.to_galaxyui_icon(icon_color)));
|
||||
button_label.add_child(
|
||||
self.render_sized_icon(appearance, icon.to_galaxyui_icon(icon_color)),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
//! A reusable component for displaying text with a copy button that shows
|
||||
//! checkmark feedback when clicked.
|
||||
|
||||
use instant::Instant;
|
||||
use std::time::Duration;
|
||||
use galaxyui::elements::{
|
||||
ConstrainedBox, Container, CrossAxisAlignment, Element, Expanded, Flex, MouseStateHandle,
|
||||
ParentElement, Shrinkable, Text,
|
||||
@@ -10,6 +8,8 @@ use galaxyui::elements::{
|
||||
use galaxyui::text_layout::ClipConfig;
|
||||
use galaxyui::ui_components::components::UiComponent;
|
||||
use galaxyui::{AppContext, SingletonEntity};
|
||||
use instant::Instant;
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::appearance::Appearance;
|
||||
use crate::ui_components::icons::Icon;
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
use std::rc::Rc;
|
||||
use std::time::Duration;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use uuid::Uuid;
|
||||
use galaxy_core::ui::builder::UiBuilder;
|
||||
use galaxy_core::ui::theme::color::internal_colors;
|
||||
use galaxyui::elements::ChildView;
|
||||
@@ -22,6 +19,9 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
};
|
||||
use galaxyui::{Action, ViewHandle};
|
||||
use pathfinder_color::ColorU;
|
||||
use pathfinder_geometry::vector::vec2f;
|
||||
use uuid::Uuid;
|
||||
|
||||
use crate::{appearance::Appearance, themes::theme::Fill};
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
use std::fmt::Debug;
|
||||
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, ChildAnchor, ChildView, ConstrainedBox, Container, Element, Icon,
|
||||
@@ -17,6 +16,7 @@ use galaxyui::{
|
||||
Action, AppContext, BlurContext, Entity, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
ViewHandle, WeakViewHandle,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::{
|
||||
appearance::Appearance,
|
||||
|
||||
@@ -10,7 +10,6 @@ use crate::ui_components::{blended_colors, icons::Icon};
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::themes::theme::Fill;
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxyui::elements::{ChildAnchor, OffsetPositioning, Radius, SavePosition, Shrinkable};
|
||||
use galaxyui::keymap::EditableBinding;
|
||||
use galaxyui::ui_components::components::UiComponent;
|
||||
@@ -30,6 +29,7 @@ use galaxyui::{
|
||||
};
|
||||
use galaxyui::{presenter::ChildView, ViewContext, ViewHandle};
|
||||
use galaxyui::{FocusContext, ModelHandle};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
pub const FIND_BAR_WIDTH: f32 = 500.;
|
||||
const ICON_PADDING: f32 = 4.;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use std::sync::Arc;
|
||||
use galaxy_core::ui::appearance::Appearance;
|
||||
use galaxyui::{platform::WindowStyle, App};
|
||||
use std::sync::Arc;
|
||||
|
||||
use crate::auth::AuthStateProvider;
|
||||
use crate::server::server_api::{team::MockTeamClient, workspace::MockWorkspaceClient};
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
use pathfinder_color::ColorU;
|
||||
use galaxyui::{
|
||||
elements::{
|
||||
Border, Container, CornerRadius, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize,
|
||||
@@ -8,6 +7,7 @@ use galaxyui::{
|
||||
AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
|
||||
ViewHandle,
|
||||
};
|
||||
use pathfinder_color::ColorU;
|
||||
|
||||
use crate::{
|
||||
appearance::Appearance,
|
||||
|
||||
Reference in New Issue
Block a user