From 717311ca88e1413ad2d21b06a93c1dd59dcffee7 Mon Sep 17 00:00:00 2001 From: sam edelsten <samedelsten1@gmail.com> Date: Mon, 29 Apr 2024 19:37:49 +0100 Subject: [PATCH] tidy example use statements --- examples/basic_sprite.rs | 3 +-- examples/basic_ui.rs | 3 +-- examples/every_option.rs | 1 - examples/font_per_widget.rs | 1 - examples/image_background.rs | 1 - examples/multiple_sprites.rs | 1 - examples/password.rs | 1 - examples/placeholder.rs | 5 +---- examples/readonly.rs | 1 - examples/sprite_and_ui_clickable.rs | 4 ---- src/lib.rs | 5 ++--- 11 files changed, 5 insertions(+), 21 deletions(-) diff --git a/examples/basic_sprite.rs b/examples/basic_sprite.rs index 5c37182..8f498f2 100644 --- a/examples/basic_sprite.rs +++ b/examples/basic_sprite.rs @@ -1,6 +1,5 @@ use bevy::{prelude::*, window::PrimaryWindow}; -use bevy_cosmic_edit::{focus::FocusedWidget, *}; -use util::{change_active_editor_sprite, deselect_editor_on_esc, print_editor_text}; +use bevy_cosmic_edit::*; fn setup( mut commands: Commands, diff --git a/examples/basic_ui.rs b/examples/basic_ui.rs index ef01735..1c44bf0 100644 --- a/examples/basic_ui.rs +++ b/examples/basic_ui.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; -use bevy_cosmic_edit::{focus::FocusedWidget, *}; -use util::{change_active_editor_ui, deselect_editor_on_esc, print_editor_text}; +use bevy_cosmic_edit::*; fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { let camera_bundle = Camera2dBundle { diff --git a/examples/every_option.rs b/examples/every_option.rs index b6e3ba9..1e1d6aa 100644 --- a/examples/every_option.rs +++ b/examples/every_option.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{bevy_color_to_cosmic, change_active_editor_ui, deselect_editor_on_esc}; #[derive(Resource)] struct TextChangeTimer(pub Timer); diff --git a/examples/font_per_widget.rs b/examples/font_per_widget.rs index 1728274..a599c68 100644 --- a/examples/font_per_widget.rs +++ b/examples/font_per_widget.rs @@ -2,7 +2,6 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{bevy_color_to_cosmic, change_active_editor_ui, deselect_editor_on_esc}; fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { commands.spawn(Camera2dBundle::default()); diff --git a/examples/image_background.rs b/examples/image_background.rs index 3d9b404..4815278 100644 --- a/examples/image_background.rs +++ b/examples/image_background.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{bevy_color_to_cosmic, change_active_editor_ui, deselect_editor_on_esc}; fn setup(mut commands: Commands, asset_server: Res<AssetServer>) { commands.spawn(Camera2dBundle::default()); diff --git a/examples/multiple_sprites.rs b/examples/multiple_sprites.rs index e8623fc..e5cdb50 100644 --- a/examples/multiple_sprites.rs +++ b/examples/multiple_sprites.rs @@ -1,6 +1,5 @@ use bevy::{prelude::*, window::PrimaryWindow}; use bevy_cosmic_edit::*; -use util::{bevy_color_to_cosmic, change_active_editor_sprite}; fn setup( mut commands: Commands, diff --git a/examples/password.rs b/examples/password.rs index cfff358..4314c46 100644 --- a/examples/password.rs +++ b/examples/password.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{change_active_editor_sprite, deselect_editor_on_esc, print_editor_text}; fn setup(mut commands: Commands) { commands.spawn(Camera2dBundle::default()); diff --git a/examples/placeholder.rs b/examples/placeholder.rs index 82d4595..64192ad 100644 --- a/examples/placeholder.rs +++ b/examples/placeholder.rs @@ -1,8 +1,5 @@ use bevy::prelude::*; -use bevy_cosmic_edit::{placeholder::Placeholder, *}; -use util::{ - bevy_color_to_cosmic, change_active_editor_ui, deselect_editor_on_esc, print_editor_text, -}; +use bevy_cosmic_edit::*; fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { let camera_bundle = Camera2dBundle { diff --git a/examples/readonly.rs b/examples/readonly.rs index 0a76bd8..b339fa9 100644 --- a/examples/readonly.rs +++ b/examples/readonly.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{bevy_color_to_cosmic, change_active_editor_ui}; fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { commands.spawn(Camera2dBundle::default()); diff --git a/examples/sprite_and_ui_clickable.rs b/examples/sprite_and_ui_clickable.rs index 0afb584..68d87e4 100644 --- a/examples/sprite_and_ui_clickable.rs +++ b/examples/sprite_and_ui_clickable.rs @@ -1,9 +1,5 @@ use bevy::prelude::*; use bevy_cosmic_edit::*; -use util::{ - bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, - deselect_editor_on_esc, -}; fn setup(mut commands: Commands) { commands.spawn(Camera2dBundle::default()); diff --git a/src/lib.rs b/src/lib.rs index 2892bfd..5926c02 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,7 @@ mod input; mod password; mod placeholder; mod render; -pub mod util; +mod util; mod widget; use std::{path::PathBuf, time::Duration}; @@ -22,11 +22,10 @@ pub use cosmic_text::{ pub use cursor::*; pub use focus::*; pub use input::*; -#[cfg(target_arch = "wasm32")] -use input::{poll_wasm_paste, WasmPaste, WasmPasteAsyncChannel}; pub use password::*; pub use placeholder::*; pub use render::*; +pub use util::*; pub use widget::*; /// Plugin struct that adds systems and initializes resources related to cosmic edit functionality. -- GitLab