From 53043a5a71fe540244068980f6ae9ddc2b3e7550 Mon Sep 17 00:00:00 2001
From: StaffEngineer <velo.app1@gmail.com>
Date: Tue, 19 Dec 2023 10:18:09 +0000
Subject: [PATCH] Do not use cosmic_text directly in examples.
---
examples/basic_sprite.rs | 11 ++++-------
examples/basic_ui.rs | 11 ++++-------
examples/bevy_api_testing.rs | 2 +-
examples/every_option.rs | 2 +-
examples/font_per_widget.rs | 2 +-
examples/image_background.rs | 2 +-
examples/login.rs | 2 +-
examples/multiple_sprites.rs | 2 +-
examples/readonly.rs | 2 +-
examples/text_input.rs | 2 +-
10 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/examples/basic_sprite.rs b/examples/basic_sprite.rs
index e2befd8..836ca4b 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 50c9008..098b0d5 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 2b7c26d..e60c1c5 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 048879f..015dcc0 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 0f51356..f71241d 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 1b9ed6d..830126b 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 cf237bd..3c57011 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 0366731..04f61ce 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 0d7aa8c..0f50de8 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 535ecb3..2954e6b 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,
--
GitLab