Skip to content
Snippets Groups Projects
Commit 95ea9da0 authored by sam edelsten's avatar sam edelsten
Browse files

tidy up merge, remove refrences to `CursorConfig`

parent ef77306c
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,7 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { ...@@ -26,6 +26,7 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
max_chars: MaxChars(15), max_chars: MaxChars(15),
max_lines: MaxLines(1), max_lines: MaxLines(1),
mode: CosmicWrap::Wrap, mode: CosmicWrap::Wrap,
hover_cursor: HoverCursor(CursorIcon::Pointer),
// CosmicEdit draws to this spritebundle // CosmicEdit draws to this spritebundle
sprite_bundle: SpriteBundle { sprite_bundle: SpriteBundle {
sprite: Sprite { sprite: Sprite {
...@@ -42,7 +43,6 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) { ...@@ -42,7 +43,6 @@ fn setup(mut commands: Commands, mut font_system: ResMut<CosmicFontSystem>) {
// Computed fields // Computed fields
padding: Default::default(), padding: Default::default(),
widget_size: Default::default(), widget_size: Default::default(),
hover_cursor: Default::default(),
}) })
.id(); .id();
......
...@@ -29,10 +29,7 @@ fn setup(mut commands: Commands) { ...@@ -29,10 +29,7 @@ fn setup(mut commands: Commands) {
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugins(CosmicEditPlugin { .add_plugins(CosmicEditPlugin { ..default() })
change_cursor: CursorConfig::Default,
..default()
})
.add_systems(Startup, setup) .add_systems(Startup, setup)
.add_systems( .add_systems(
Update, Update,
......
...@@ -68,10 +68,7 @@ fn ev_test( ...@@ -68,10 +68,7 @@ fn ev_test(
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_plugins(CosmicEditPlugin { .add_plugins(CosmicEditPlugin { ..default() })
change_cursor: CursorConfig::Default,
..default()
})
.add_systems(Startup, setup) .add_systems(Startup, setup)
.add_systems( .add_systems(
Update, Update,
......
...@@ -116,7 +116,6 @@ pub use widget::*; ...@@ -116,7 +116,6 @@ pub use widget::*;
#[derive(Default)] #[derive(Default)]
pub struct CosmicEditPlugin { pub struct CosmicEditPlugin {
pub font_config: CosmicFontConfig, pub font_config: CosmicFontConfig,
pub change_cursor: CursorConfig,
} }
impl Plugin for CosmicEditPlugin { impl Plugin for CosmicEditPlugin {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment