From c199a6a3a052c1a7f59e4880cace46783845926a Mon Sep 17 00:00:00 2001
From: StaffEngineer <velo.app1@gmail.com>
Date: Sun, 17 Sep 2023 12:08:12 +0100
Subject: [PATCH] rename set_text to text
---
examples/basic_sprite.rs | 2 +-
examples/basic_ui.rs | 2 +-
examples/every_option.rs | 2 +-
examples/font_per_widget.rs | 4 ++--
examples/multiple_sprites.rs | 4 ++--
examples/readonly.rs | 2 +-
examples/restricted_input.rs | 2 +-
src/lib.rs | 12 ++++++------
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/examples/basic_sprite.rs b/examples/basic_sprite.rs
index 1019ce1..ee3d6d0 100644
--- a/examples/basic_sprite.rs
+++ b/examples/basic_sprite.rs
@@ -32,7 +32,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
},
text_position: CosmicTextPosition::Center,
cosmic_attrs: CosmicAttrs(AttrsOwned::new(attrs)),
- set_text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
+ text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
..default()
};
diff --git a/examples/basic_ui.rs b/examples/basic_ui.rs
index 09235a7..18267ec 100644
--- a/examples/basic_ui.rs
+++ b/examples/basic_ui.rs
@@ -33,7 +33,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
},
text_position: CosmicTextPosition::Center,
cosmic_attrs: CosmicAttrs(AttrsOwned::new(attrs)),
- set_text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
+ text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
..default()
};
diff --git a/examples/every_option.rs b/examples/every_option.rs
index 0fe4f19..9777aee 100644
--- a/examples/every_option.rs
+++ b/examples/every_option.rs
@@ -49,7 +49,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
},
max_chars: CosmicMaxChars(15),
max_lines: CosmicMaxLines(1),
- set_text: CosmicText::OneStyle("BANANA IS THE CODEWORD!".into()),
+ text: CosmicText::OneStyle("BANANA IS THE CODEWORD!".into()),
})
.id();
diff --git a/examples/font_per_widget.rs b/examples/font_per_widget.rs
index 089a17b..fa90dad 100644
--- a/examples/font_per_widget.rs
+++ b/examples/font_per_widget.rs
@@ -225,7 +225,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
..default()
},
background_color: BackgroundColor(Color::WHITE),
- set_text: CosmicText::MultiStyle(lines),
+ text: CosmicText::MultiStyle(lines),
..default()
};
@@ -247,7 +247,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
height: Val::Percent(100.),
..default()
},
- set_text: CosmicText::OneStyle("Widget 2.\nClick on me =>".to_string()),
+ text: CosmicText::OneStyle("Widget 2.\nClick on me =>".to_string()),
..default()
};
diff --git a/examples/multiple_sprites.rs b/examples/multiple_sprites.rs
index 2c2c74a..77e7ad5 100644
--- a/examples/multiple_sprites.rs
+++ b/examples/multiple_sprites.rs
@@ -37,7 +37,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
transform: Transform::from_translation(Vec3::new(-primary_window.width() / 4., 0., 1.)),
text_position: CosmicTextPosition::Center,
background_color: BackgroundColor(Color::ALICE_BLUE),
- set_text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
+ text: CosmicText::OneStyle("😀😀😀 x => y".to_string()),
..default()
};
@@ -58,7 +58,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
)),
text_position: CosmicTextPosition::Center,
background_color: BackgroundColor(Color::GRAY.with_a(0.5)),
- set_text: CosmicText::OneStyle("Widget_2. Click on me".to_string()),
+ text: CosmicText::OneStyle("Widget_2. Click on me".to_string()),
..default()
};
diff --git a/examples/readonly.rs b/examples/readonly.rs
index efbacca..e42a3b2 100644
--- a/examples/readonly.rs
+++ b/examples/readonly.rs
@@ -37,7 +37,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
line_height: 18.,
scale_factor: primary_window.scale_factor() as f32,
},
- set_text: CosmicText::OneStyle("😀😀😀 x => y\nRead only widget".to_string()),
+ text: CosmicText::OneStyle("😀😀😀 x => y\nRead only widget".to_string()),
..default()
};
diff --git a/examples/restricted_input.rs b/examples/restricted_input.rs
index e43b2aa..7077e37 100644
--- a/examples/restricted_input.rs
+++ b/examples/restricted_input.rs
@@ -32,7 +32,7 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
},
max_chars: CosmicMaxChars(15),
max_lines: CosmicMaxLines(1),
- set_text: CosmicText::OneStyle(
+ text: CosmicText::OneStyle(
"1 line 15 chars! But this\n is longer\n than is\n allowed by\n the limits.\n"
.into(),
),
diff --git a/src/lib.rs b/src/lib.rs
index 0a669d3..b970fee 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -284,8 +284,7 @@ pub struct CosmicEditUiBundle {
/// How many characters are allowed in buffer, 0 for no limit
pub max_chars: CosmicMaxChars,
/// Setting this will update the buffer's text
- // TODO sync this with the buffer to allow getting from here as well as setting
- pub set_text: CosmicText,
+ pub text: CosmicText,
}
impl Default for CosmicEditUiBundle {
@@ -310,7 +309,7 @@ impl Default for CosmicEditUiBundle {
background_image: Default::default(),
max_lines: Default::default(),
max_chars: Default::default(),
- set_text: Default::default(),
+ text: Default::default(),
}
}
}
@@ -341,7 +340,8 @@ pub struct CosmicEditSpriteBundle {
pub max_lines: CosmicMaxLines,
/// How many characters are allowed in buffer, 0 for no limit
pub max_chars: CosmicMaxChars,
- pub set_text: CosmicText,
+ /// Setting this will update the buffer's text
+ pub text: CosmicText,
}
impl Default for CosmicEditSpriteBundle {
@@ -360,7 +360,7 @@ impl Default for CosmicEditSpriteBundle {
background_image: Default::default(),
max_lines: Default::default(),
max_chars: Default::default(),
- set_text: Default::default(),
+ text: Default::default(),
}
}
}
@@ -1482,7 +1482,7 @@ mod tests {
fn test_spawn_cosmic_edit_system(mut commands: Commands) {
commands.spawn(CosmicEditUiBundle {
- set_text: CosmicText::OneStyle("Blah".into()),
+ text: CosmicText::OneStyle("Blah".into()),
..Default::default()
});
}
--
GitLab