first pass of merging in warp (doesn't build)

This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
@@ -1,6 +1,7 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -4,8 +4,9 @@ use galaxyui::elements::shimmering_text::{
};
use galaxyui::elements::{Align, ConstrainedBox, ParentElement, Rect, Stack};
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
text: String,
@@ -1,6 +1,7 @@
use std::borrow::Cow;
use anyhow::{anyhow, Result};
use root_view::RootView;
use std::borrow::Cow;
pub mod root_view;
extern crate galaxyui;
@@ -1,12 +1,9 @@
use galaxyui::{
assets::asset_cache::AssetSource,
elements::{
CacheOption, ConstrainedBox, CrossAxisAlignment, Flex, Image, ParentElement, Shrinkable,
Stack,
},
AppContext, Element, Entity, TypedActionView, View,
};
use instant::Instant;
use galaxyui::assets::asset_cache::AssetSource;
use galaxyui::elements::{
CacheOption, ConstrainedBox, CrossAxisAlignment, Flex, Image, ParentElement, Shrinkable, Stack,
};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
pub struct RootView {
animation_start_time: Instant,
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,14 +1,13 @@
use galaxyui::elements::DispatchEventResult;
use pathfinder_color::ColorU;
use galaxyui::elements::{
Align, Border, ChildView, Container, CornerRadius, DispatchEventResult, EventHandler, Flex,
ParentElement, Radius, Rect, Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
elements::{
Align, Border, ChildView, Container, CornerRadius, EventHandler, Flex, ParentElement,
Radius, Rect, Stack, Text,
},
AppContext, Element, Entity, ModelHandle, SingletonEntity, Tracked, TypedActionView, View,
ViewContext, ViewHandle,
};
use pathfinder_color::ColorU;
pub fn init(ctx: &mut AppContext) {
ctx.add_singleton_model(|_| Settings {
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,5 +1,7 @@
use galaxyui::{elements::Rect, AppContext, Element, Entity, TypedActionView, View};
use pathfinder_color::ColorU;
use galaxyui::elements::Rect;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
pub struct BlurredView {}
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,18 +1,13 @@
use std::any::Any;
use galaxyui::elements::{AcceptedByDropTarget, DropTarget, DropTargetData};
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, DragAxis, Draggable, DraggableState, ParentElement, Rect,
Stack,
},
AppContext, Element, Entity, TypedActionView, View,
};
use pathfinder_color::ColorU;
use pathfinder_geometry::{
rect::RectF,
vector::{vec2f, Vector2F},
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use galaxyui::elements::{
AcceptedByDropTarget, Align, ConstrainedBox, Container, DragAxis, Draggable, DraggableState,
DropTarget, DropTargetData, ParentElement, Rect, Stack,
};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
#[derive(Default)]
pub struct RootView {
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,5 +1,7 @@
use galaxyui::{elements::Rect, AppContext, Element, Entity, TypedActionView, View};
use pathfinder_color::ColorU;
use galaxyui::elements::Rect;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
pub struct RootView {}
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,15 +1,12 @@
use galaxyui::elements::{Expanded, Shrinkable};
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, Flex, MainAxisAlignment, MainAxisSize, ParentElement,
Rect, Stack, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use galaxyui::color::ColorU;
use galaxyui::elements::{
Border, ConstrainedBox, Container, Expanded, Flex, MainAxisAlignment, MainAxisSize,
ParentElement, Rect, Shrinkable, Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
font_family: FamilyId,
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
+8 -10
View File
@@ -1,14 +1,12 @@
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, Flex, MainAxisAlignment, MainAxisSize, ParentElement,
Rect, Shrinkable, Stack, Text, Wrap,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use galaxyui::color::ColorU;
use galaxyui::elements::{
Border, ConstrainedBox, Container, Flex, MainAxisAlignment, MainAxisSize, ParentElement, Rect,
Shrinkable, Stack, Text, Wrap,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
font_family: FamilyId,
@@ -1,6 +1,7 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,18 +1,17 @@
//! A UI sample demonstrating how the SelectableArea element can be used.
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
ChildView, ConstrainedBox, Flex, FormattedTextElement, HeadingFontSizeMultipliers,
ParentElement, Rect, SelectableArea, SelectionHandle, Stack, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use markdown_parser::{parse_markdown, FormattedTextFragment, FormattedTextLine};
use galaxyui::color::ColorU;
use galaxyui::elements::{Align, HighlightedHyperlink, HyperlinkLens};
use galaxyui::elements::{
Align, ChildView, ConstrainedBox, Flex, FormattedTextElement, HeadingFontSizeMultipliers,
HighlightedHyperlink, HyperlinkLens, ParentElement, Rect, SelectableArea, SelectionHandle,
Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
ViewHandle,
};
pub struct RootView {
sub_view: ViewHandle<FormattedTextView>,
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,18 +1,18 @@
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
Align, ConstrainedBox, Container, DispatchEventResult, EventHandler, Padding,
ParentElement, Rect, Stack, Text,
},
fonts::{Cache as FontCache, FamilyId},
platform::CapturedFrame,
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use image::ImageEncoder;
use pathfinder_color::ColorU;
use std::sync::{Arc, Mutex};
use std::time::{SystemTime, UNIX_EPOCH};
use image::ImageEncoder;
use pathfinder_color::ColorU;
use galaxyui::elements::{
Align, ConstrainedBox, Container, DispatchEventResult, EventHandler, Padding, ParentElement,
Rect, Stack, Text,
};
use galaxyui::fonts::{Cache as FontCache, FamilyId};
use galaxyui::platform::CapturedFrame;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
#[derive(Clone, Debug)]
pub enum RootViewAction {
CaptureFrame,
+5 -7
View File
@@ -1,11 +1,9 @@
use galaxyui::{
elements::{
CacheOption, ConstrainedBox, Flex, Icon, Image, MainAxisAlignment, MainAxisSize,
ParentElement, Rect, Stack,
},
AppContext, Element, Entity, TypedActionView, View,
};
use pathfinder_color::ColorU;
use galaxyui::elements::{
CacheOption, ConstrainedBox, Flex, Icon, Image, MainAxisAlignment, MainAxisSize, ParentElement,
Rect, Stack,
};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
pub struct RootView {}
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
+9 -11
View File
@@ -1,16 +1,14 @@
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
Border, ConstrainedBox, Container, Fill, Flex, List, ListState, MainAxisSize,
ParentElement, Rect, ScrollStateHandle, Scrollable, ScrollableElement, ScrollbarWidth,
Stack, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use std::sync::{Arc, Mutex};
use galaxyui::color::ColorU;
use std::sync::{Arc, Mutex};
use galaxyui::elements::{
Border, ConstrainedBox, Container, Fill, Flex, List, ListState, MainAxisSize, ParentElement,
Rect, ScrollStateHandle, Scrollable, ScrollableElement, ScrollbarWidth, Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
font_family: FamilyId,
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -6,26 +6,19 @@ use galaxyui::elements::new_scrollable::ScrollableAppearance;
use galaxyui::elements::new_scrollable::ScrollableAxis;
use galaxyui::elements::Axis;
use pathfinder_geometry::rect::RectF;
use pathfinder_geometry::vector::vec2f;
use pathfinder_geometry::vector::Vector2F;
use galaxyui::elements::ChildView;
use galaxyui::elements::ClippedScrollStateHandle;
use galaxyui::elements::NewScrollable;
use galaxyui::elements::Point;
use galaxyui::elements::ScrollData;
use galaxyui::elements::ScrollStateHandle;
use pathfinder_geometry::vector::{vec2f, Vector2F};
use galaxyui::color::ColorU;
use galaxyui::elements::new_scrollable::{
AxisConfiguration, ClippedAxisConfiguration, DualAxisConfig, NewScrollableElement,
ScrollableAppearance, ScrollableAxis,
};
use galaxyui::elements::{
Axis, ChildView, ClippedScrollStateHandle, ConstrainedBox, NewScrollable, ParentElement, Point,
Rect, ScrollData, ScrollStateHandle, ScrollbarWidth, Stack,
};
use galaxyui::keymap::FixedBinding;
use galaxyui::units::Pixels;
use galaxyui::AppContext;
use galaxyui::TypedActionView;
use galaxyui::ViewHandle;
use galaxyui::{
elements::{ConstrainedBox, ParentElement, Rect, ScrollbarWidth, Stack},
Element, Entity, View, ViewContext,
};
use galaxyui::color::ColorU;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
pub fn init(ctx: &mut AppContext) {
use galaxyui::keymap::macros::*;
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,12 +1,11 @@
use galaxyui::color::ColorU;
use galaxyui::elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment,
MainAxisSize, ParentElement, Percentage, Rect, Shrinkable, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
color::ColorU,
elements::{
Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment,
MainAxisSize, ParentElement, Percentage, Rect, Shrinkable, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
@@ -1,13 +1,11 @@
use galaxyui::color::ColorU;
use galaxyui::elements::{
resizable_state_handle, Container, CrossAxisAlignment, DragBarSide, Flex, MainAxisAlignment,
MainAxisSize, ParentElement, Rect, Resizable, ResizableStateHandle, Shrinkable, Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
color::ColorU,
elements::{
resizable_state_handle, Container, CrossAxisAlignment, DragBarSide, Flex,
MainAxisAlignment, MainAxisSize, ParentElement, Rect, Resizable, ResizableStateHandle,
Shrinkable, Stack, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
};
pub struct RootView {
@@ -1,12 +1,9 @@
use galaxyui::elements::ClippedScrollStateHandle;
use galaxyui::elements::ClippedScrollable;
use galaxyui::{
elements::{ConstrainedBox, Container, Flex, ParentElement, Rect, ScrollbarWidth, Stack},
AppContext, Element, Entity, TypedActionView, View, ViewContext,
};
use galaxyui::color::ColorU;
use galaxyui::elements::{
ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container, Flex, ParentElement,
Rect, ScrollbarWidth, Stack,
};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext};
#[derive(Default)]
pub struct RootView {
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -8,8 +8,10 @@ use galaxyui::ui_components::components::{Coords, UiComponentStyles};
use galaxyui::ui_components::segmented_control::{
LabelConfig, RenderableOptionConfig, SegmentedControl, SegmentedControlEvent,
};
use galaxyui::SingletonEntity as _;
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
ViewHandle,
};
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum DisplayMode {
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,16 +1,15 @@
//! A UI sample demonstrating how the SelectableArea element can be used.
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{
Border, ChildView, ConstrainedBox, Container, Flex, ParentElement, Rect, SelectableArea,
SelectionHandle, Stack, Text,
},
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use galaxyui::color::ColorU;
use galaxyui::elements::{
Border, ChildView, ConstrainedBox, Container, Flex, ParentElement, Rect, SelectableArea,
SelectionHandle, Stack, Text,
};
use galaxyui::fonts::FamilyId;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
ViewHandle,
};
pub struct RootView {
sub_view: ViewHandle<SelectableExampleView>,
+2 -1
View File
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,13 +1,10 @@
use galaxyui::elements::{
Align, ConstrainedBox, Container, CornerRadius, DropShadow, Radius, Shrinkable,
};
use galaxyui::{
elements::{Flex, ParentElement, Rect},
AppContext, Element, Entity, TypedActionView, View,
};
use pathfinder_geometry::vector::vec2f;
use galaxyui::color::ColorU;
use galaxyui::elements::{
Align, ConstrainedBox, Container, CornerRadius, DropShadow, Flex, ParentElement, Radius, Rect,
Shrinkable,
};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View};
pub struct RootView;
+5 -9
View File
@@ -1,13 +1,9 @@
use galaxyui::{
elements::{Align, Container},
presenter::ChildView,
ui_components::{
components::{UiComponent, UiComponentStyles},
slider::{Slider, SliderStateHandle},
},
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use pathfinder_color::ColorU;
use galaxyui::elements::{Align, Container};
use galaxyui::presenter::ChildView;
use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
use galaxyui::ui_components::slider::{Slider, SliderStateHandle};
use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
/// Renders a center-aligned slider component against a black background. When the slider is
/// dragged, the updated value is printed to stdout.
@@ -1,11 +1,14 @@
use std::borrow::Cow;
use anyhow::{anyhow, Result};
use pathfinder_geometry::vector::vec2f;
use std::borrow::Cow;
pub mod root_view;
extern crate galaxyui;
use galaxyui::{platform, platform::WindowBounds, AssetProvider};
use rust_embed::RustEmbed;
use galaxyui::platform::WindowBounds;
use galaxyui::{platform, AssetProvider};
#[derive(Clone, Copy, RustEmbed)]
#[folder = "examples/assets"]
@@ -1,4 +1,6 @@
use crate::CaptureConfig;
use std::sync::{Arc, Mutex};
use image::ImageEncoder;
use galaxyui::color::ColorU;
use galaxyui::elements::{
ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container, Empty, Fill, Flex,
@@ -10,12 +12,12 @@ use galaxyui::fonts::FamilyId;
use galaxyui::keymap::FixedBinding;
use galaxyui::platform::CapturedFrame;
use galaxyui::presenter::ChildView;
use galaxyui::SingletonEntity as _;
use galaxyui::{
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle, WindowId,
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
ViewHandle, WindowId,
};
use image::ImageEncoder;
use std::sync::{Arc, Mutex};
use crate::CaptureConfig;
const TOTAL_DEMOS: usize = 13;
@@ -1,5 +1,6 @@
use anyhow::{anyhow, Result};
use std::borrow::Cow;
use anyhow::{anyhow, Result};
pub mod root_view;
extern crate galaxyui;
@@ -1,12 +1,12 @@
use galaxyui::fonts::FamilyId;
use galaxyui::SingletonEntity as _;
use galaxyui::{
elements::{Align, ConstrainedBox, ParentElement, Rect, Stack, Text},
keymap::FixedBinding,
presenter::ChildView,
AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
};
use pathfinder_color::ColorU;
use galaxyui::elements::{Align, ConstrainedBox, ParentElement, Rect, Stack, Text};
use galaxyui::fonts::FamilyId;
use galaxyui::keymap::FixedBinding;
use galaxyui::presenter::ChildView;
use galaxyui::{
AppContext, Element, Entity, SingletonEntity as _, TypedActionView, View, ViewContext,
ViewHandle,
};
// We could initiate global action and bindings here.
pub fn init(ctx: &mut AppContext) {