diff --git a/examples/basic_sprite.rs b/examples/basic_sprite.rs index e2befd82470db50e402f85fc858a83134fbef4dd..836ca4b8a55b77d091dfb7a8d123c5c7c71a1b61 100644 --- a/examples/basic_sprite.rs +++ b/examples/basic_sprite.rs @@ -1,8 +1,5 @@ use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*, window::PrimaryWindow}; -use bevy_cosmic_edit::{ - AttrsOwned, CosmicAttrs, CosmicEditBundle, CosmicEditPlugin, CosmicFontConfig, CosmicMetrics, - CosmicText, CosmicTextPosition, Focus, -}; +use bevy_cosmic_edit::*; fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { let primary_window = windows.single(); @@ -14,9 +11,9 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { }; commands.spawn(camera_bundle); - let mut attrs = cosmic_text::Attrs::new(); - attrs = attrs.family(cosmic_text::Family::Name("Victor Mono")); - attrs = attrs.color(cosmic_text::Color::rgb(0x94, 0x00, 0xD3)); + let mut attrs = Attrs::new(); + attrs = attrs.family(Family::Name("Victor Mono")); + attrs = attrs.color(CosmicColor::rgb(0x94, 0x00, 0xD3)); let scale_factor = primary_window.scale_factor() as f32; diff --git a/examples/basic_ui.rs b/examples/basic_ui.rs index 50c90082bf3502c6bd8990b0ee99fdcebc928831..098b0d5a4fc23e1ff2e85f29af057a298d6508c3 100644 --- a/examples/basic_ui.rs +++ b/examples/basic_ui.rs @@ -1,8 +1,5 @@ use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*, window::PrimaryWindow}; -use bevy_cosmic_edit::{ - AttrsOwned, CosmicAttrs, CosmicEditBundle, CosmicEditPlugin, CosmicEditor, CosmicFontConfig, - CosmicMetrics, CosmicSource, CosmicText, CosmicTextPosition, Focus, -}; +use bevy_cosmic_edit::*; fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { let primary_window = windows.single(); @@ -14,9 +11,9 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { }; commands.spawn(camera_bundle); - let mut attrs = cosmic_text::Attrs::new(); - attrs = attrs.family(cosmic_text::Family::Name("Victor Mono")); - attrs = attrs.color(cosmic_text::Color::rgb(0x94, 0x00, 0xD3)); + let mut attrs = Attrs::new(); + attrs = attrs.family(Family::Name("Victor Mono")); + attrs = attrs.color(CosmicColor::rgb(0x94, 0x00, 0xD3)); let scale_factor = primary_window.scale_factor() as f32; diff --git a/examples/bevy_api_testing.rs b/examples/bevy_api_testing.rs index 2b7c26da09788eb30eeb04bbd429b106dcfddf48..e60c1c51a5349acc9ea0384eaf544978a397bb2f 100644 --- a/examples/bevy_api_testing.rs +++ b/examples/bevy_api_testing.rs @@ -56,7 +56,7 @@ fn setup(mut commands: Commands) { } fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/every_option.rs b/examples/every_option.rs index 048879f61ef544c8a9b69a49dc3faa64460948ac..015dcc0b044bdb0dc3b9cb62921613cd5ec58c63 100644 --- a/examples/every_option.rs +++ b/examples/every_option.rs @@ -77,7 +77,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { } pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/font_per_widget.rs b/examples/font_per_widget.rs index 0f513566c21d93a42f3402c296ee895145f4d090..f71241dcef6633374909e3de005c060774efac2d 100644 --- a/examples/font_per_widget.rs +++ b/examples/font_per_widget.rs @@ -271,7 +271,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { } fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/image_background.rs b/examples/image_background.rs index 1b9ed6db508a34a998dbf8a73b32ddcc2b99c18f..830126b85c38b6b396f37ada428b9a110dc0f7ac 100644 --- a/examples/image_background.rs +++ b/examples/image_background.rs @@ -35,7 +35,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) { } pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/login.rs b/examples/login.rs index cf237bdb0826f2a8c106622ba6070acb80cb3526..3c5701163697ad9a466df34bab5b491119cd5f8b 100644 --- a/examples/login.rs +++ b/examples/login.rs @@ -177,7 +177,7 @@ fn setup(mut commands: Commands, window: Query<&Window, With<PrimaryWindow>>) { } fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/multiple_sprites.rs b/examples/multiple_sprites.rs index 0366731bb53f409ab1731d92adaa02fea4678476..04f61ce352a80a7c83f8f201c0ca71539ddf19c9 100644 --- a/examples/multiple_sprites.rs +++ b/examples/multiple_sprites.rs @@ -72,7 +72,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { } fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/readonly.rs b/examples/readonly.rs index 0d7aa8c053fa7aa40d2d66ab526539dd0a34d8a6..0f50de8a37d76f1d31cdeecc688f7c7b538ec86e 100644 --- a/examples/readonly.rs +++ b/examples/readonly.rs @@ -56,7 +56,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) { } pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8, diff --git a/examples/text_input.rs b/examples/text_input.rs index 535ecb36ce19608373b228637971ec0cd7b4e5dc..2954e6b74b27b5e4659768d9b515be89e0c1a176 100644 --- a/examples/text_input.rs +++ b/examples/text_input.rs @@ -132,7 +132,7 @@ fn handle_enter( } fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor { - cosmic_text::Color::rgba( + CosmicColor::rgba( (color.r() * 255.) as u8, (color.g() * 255.) as u8, (color.b() * 255.) as u8,