diff --git a/examples/basic_sprite.rs b/examples/basic_sprite.rs index 5c371823fd8b6a66379dd6d96e86b9233736664b..8f498f28ee11895d6a4940271bac95916b1652d2 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 ef01735a4faf8a86c3087fe92715038ab82fc0e9..1c44bf012477487eac65e8d3cc0ed98fd1807244 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 b6e3ba90beb6c7e9ed13ca60c355aff9dde211ae..1e1d6aa4e1428ba2673cf560e7322cb6b12b0a23 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 17282745303a8cd5cc5de4f2249dae72f73ab705..a599c689134616c4a823ae38f127465e54af8639 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 3d9b404260569b5f6c9194f76e8fc3d786a2b30f..48152788956371873d2c1501b42c343e26ce9259 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 e8623fcaf16552907c23699ac2a987aa010fd2c3..e5cdb5098ff9937382ec04625e808f01f10c0eb3 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 cfff358c77f18f11080f9c9017c74a974bce4995..4314c464ae098b9d823f36738c6f139f95b5a2a8 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 82d459515548428c7a89a781ad60f275a872f56b..64192ad6f92d693aaf3747d8856b9d1924a68816 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 0a76bd89f69ca32326a3256605b251a42ac6d92f..b339fa9c6b8bd76561a00d5803eca2587ce1472d 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 0afb584c4e46d19013cf82c0fe977aeea85d1ed4..68d87e407c25fc7b6ec89f4d8ddd7ee5871da6be 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 2892bfdf92ba52253ef04857c36109cc65f3e0c7..5926c0273c81b2f738db1383d25f3ac08014cea6 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.