From 95ea9da0105cc40f067954a2898208730792617e Mon Sep 17 00:00:00 2001
From: sam edelsten <samedelsten1@gmail.com>
Date: Tue, 30 Apr 2024 19:39:50 +0100
Subject: [PATCH] tidy up merge, remove refrences to `CursorConfig`
---
examples/every_option.rs | 2 +-
examples/password.rs | 5 +----
examples/sprite_and_ui_clickable.rs | 5 +----
src/lib.rs | 1 -
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/examples/every_option.rs b/examples/every_option.rs
index 013b2bd..96c86c3 100644
--- a/examples/every_option.rs
+++ b/examples/every_option.rs
@@ -26,6 +26,7 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
max_chars: MaxChars(15),
max_lines: MaxLines(1),
mode: CosmicWrap::Wrap,
+ hover_cursor: HoverCursor(CursorIcon::Pointer),
// CosmicEdit draws to this spritebundle
sprite_bundle: SpriteBundle {
sprite: Sprite {
@@ -42,7 +43,6 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
// Computed fields
padding: Default::default(),
widget_size: Default::default(),
- hover_cursor: Default::default(),
})
.id();
diff --git a/examples/password.rs b/examples/password.rs
index 75bfac0..290a2c7 100644
--- a/examples/password.rs
+++ b/examples/password.rs
@@ -29,10 +29,7 @@ fn setup(mut commands: Commands) {
fn main() {
App::new()
.add_plugins(DefaultPlugins)
- .add_plugins(CosmicEditPlugin {
- change_cursor: CursorConfig::Default,
- ..default()
- })
+ .add_plugins(CosmicEditPlugin { ..default() })
.add_systems(Startup, setup)
.add_systems(
Update,
diff --git a/examples/sprite_and_ui_clickable.rs b/examples/sprite_and_ui_clickable.rs
index 76c8cd7..290edaf 100644
--- a/examples/sprite_and_ui_clickable.rs
+++ b/examples/sprite_and_ui_clickable.rs
@@ -68,10 +68,7 @@ fn ev_test(
fn main() {
App::new()
.add_plugins(DefaultPlugins)
- .add_plugins(CosmicEditPlugin {
- change_cursor: CursorConfig::Default,
- ..default()
- })
+ .add_plugins(CosmicEditPlugin { ..default() })
.add_systems(Startup, setup)
.add_systems(
Update,
diff --git a/src/lib.rs b/src/lib.rs
index b62ab20..3c1331d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -116,7 +116,6 @@ pub use widget::*;
#[derive(Default)]
pub struct CosmicEditPlugin {
pub font_config: CosmicFontConfig,
- pub change_cursor: CursorConfig,
}
impl Plugin for CosmicEditPlugin {
--
GitLab