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>) {
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();
......
......@@ -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,
......
......@@ -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,
......
......@@ -116,7 +116,6 @@ pub use widget::*;
#[derive(Default)]
pub struct CosmicEditPlugin {
pub font_config: CosmicFontConfig,
pub change_cursor: CursorConfig,
}
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