Skip to content

Commit 3be430a

Browse files
Improve module names for text input files (#23995)
# Objective These names are confusing and frustrating. ## Solution Adopts and closes #23895. I redid the work to avoid merge conflict problems.
1 parent 6090daa commit 3be430a

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

crates/bevy_text/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ extern crate alloc;
3333

3434
mod bounds;
3535
mod cursor;
36+
mod editing;
3637
mod error;
3738
mod font;
3839
mod font_atlas;
@@ -44,10 +45,10 @@ mod pipeline;
4445
mod text;
4546
mod text_access;
4647
mod text_edit;
47-
mod text_editable;
4848

4949
pub use bounds::*;
5050
pub use cursor::*;
51+
pub use editing::*;
5152
pub use error::*;
5253
pub use font::*;
5354
pub use font_atlas::*;
@@ -59,7 +60,6 @@ pub use pipeline::*;
5960
pub use text::*;
6061
pub use text_access::*;
6162
pub use text_edit::*;
62-
pub use text_editable::*;
6363

6464
/// The text prelude.
6565
///

crates/bevy_ui/src/widget/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ mod button;
44
mod image;
55
mod label;
66
mod text;
7-
mod text_editable;
7+
mod text_input_layout;
88
mod viewport;
99

1010
pub use button::*;
1111
pub use image::*;
1212
pub use label::*;
1313
pub use text::*;
14-
pub use text_editable::*;
14+
pub use text_input_layout::*;
1515
pub use viewport::*;
File renamed without changes.

crates/bevy_ui_widgets/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,22 @@
2828
2929
mod button;
3030
mod checkbox;
31-
mod editable_text;
3231
mod menu;
3332
mod observe;
3433
pub mod popover;
3534
mod radio;
3635
mod scrollbar;
3736
mod slider;
37+
mod text_input;
3838

3939
pub use button::*;
4040
pub use checkbox::*;
41-
pub use editable_text::*;
4241
pub use menu::*;
4342
pub use observe::*;
4443
pub use radio::*;
4544
pub use scrollbar::*;
4645
pub use slider::*;
46+
pub use text_input::*;
4747

4848
use bevy_app::{PluginGroup, PluginGroupBuilder};
4949
use bevy_ecs::{entity::Entity, event::EntityEvent};
File renamed without changes.

0 commit comments

Comments
 (0)