Skip to content

Refactor TextBuilder initialization #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CopeFiend wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor TextBuilder initialization #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions editor/src/asset/dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ fn build_tree_recursively(
TreeBuilder::new(WidgetBuilder::new())
.with_items(children)
.with_content(
TextBuilder::new(
WidgetBuilder::new().with_vertical_alignment(VerticalAlignment::Center),
)
.with_text(format!("{name} ({data_type})"))
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new().with_vertical_alignment(VerticalAlignment::Center),
)
.with_text(format!("{name} ({data_type})"))
.build(ctx),
)
.build(ctx)
}
Expand Down
22 changes: 13 additions & 9 deletions editor/src/asset/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,14 +350,15 @@ fn make_tooltip(ctx: &mut BuildContext, text: &str) -> RcUiNodeHandle {
.with_background(ctx.style.property(Style::BRUSH_TEXT))
.with_max_size(Vector2::new(300.0, f32::INFINITY))
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.with_margin(Thickness::uniform(2.0))
.with_foreground(ctx.style.property(Style::BRUSH_DARKER)),
)
.with_wrap(WrapMode::Letter)
.with_text(text)
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_margin(Thickness::uniform(2.0))
.with_foreground(ctx.style.property(Style::BRUSH_DARKER)),
)
.with_wrap(WrapMode::Letter)
.with_text(text)
.build(ctx),
),
)
.build(ctx);
Expand Down Expand Up @@ -409,7 +410,10 @@ impl AssetItemBuilder {
.property(AssetItem::DESELECTED_TEXT_BORDER_BACKGROUND),
)
.with_child(
TextBuilder::new(WidgetBuilder::new().with_margin(Thickness::uniform(2.0)))
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new().with_margin(Thickness::uniform(2.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.with_wrap(WrapMode::Word)
Expand Down
21 changes: 11 additions & 10 deletions editor/src/asset/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,16 +154,17 @@ impl AssetRenameDialogBuilder {
let content = GridBuilder::new(
WidgetBuilder::new()
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.on_row(0)
.with_margin(Thickness::uniform(2.0)),
)
.with_text(format!(
"Enter a new name for {old_file_name}.{extension} resource."
))
.with_wrap(WrapMode::Word)
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.on_row(0)
.with_margin(Thickness::uniform(2.0)),
)
.with_text(format!(
"Enter a new name for {old_file_name}.{extension} resource."
))
.with_wrap(WrapMode::Word)
.build(ctx),
)
.with_child({
name_field = TextBoxBuilder::new(
Expand Down
2 changes: 1 addition & 1 deletion editor/src/asset/preview/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ impl AssetPreviewGenerator for FontPreview {
let mut ui = UserInterface::new(asset::item::DEFAULT_VEC_SIZE);
ScreenBuilder::new(
WidgetBuilder::new().with_child(
TextBuilder::new(WidgetBuilder::new())
TextBuilder::new()
.with_font(font)
.with_font_size(16.0.into())
.with_vertical_text_alignment(VerticalAlignment::Center)
Expand Down
33 changes: 17 additions & 16 deletions editor/src/asset/selector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,22 +182,23 @@ impl ItemBuilder {

let content = GridBuilder::new(
WidgetBuilder::new().with_child(image).with_child(
TextBuilder::new(
WidgetBuilder::new()
.on_row(1)
.with_width(64.0)
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Top)
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.with_wrap(WrapMode::Word)
.with_text(
self.path
.file_name()
.map(|file_name| file_name.to_string_lossy().to_string())
.unwrap_or_default(),
)
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.on_row(1)
.with_width(64.0)
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Top)
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.with_wrap(WrapMode::Word)
.with_text(
self.path
.file_name()
.map(|file_name| file_name.to_string_lossy().to_string())
.unwrap_or_default(),
)
.build(ctx),
),
)
.add_row(Row::auto())
Expand Down
33 changes: 18 additions & 15 deletions editor/src/audio/bus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,20 @@ fn make_items(buses: &[(Handle<AudioBus>, String)], ctx: &mut BuildContext) -> V

fn make_effect_names(names: &[String], ctx: &mut BuildContext) -> Vec<Handle<UiNode>> {
if names.is_empty() {
vec![TextBuilder::new(
WidgetBuilder::new().with_foreground(ctx.style.property(Style::BRUSH_LIGHTER)),
)
.with_text("No Effects")
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.build(ctx)
.to_base()]
vec![TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new().with_foreground(ctx.style.property(Style::BRUSH_LIGHTER)),
)
.with_text("No Effects")
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.build(ctx)
.to_base()]
} else {
names
.iter()
.map(|n| {
TextBuilder::new(WidgetBuilder::new().with_margin(Thickness::uniform(1.0)))
TextBuilder::new()
.with_widget_builder(WidgetBuilder::new().with_margin(Thickness::uniform(1.0)))
.with_text(n)
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.build(ctx)
Expand Down Expand Up @@ -194,13 +196,14 @@ impl AudioBusViewBuilder {
WidgetBuilder::new()
.with_child(
BorderBuilder::new(WidgetBuilder::new().on_row(0).on_column(0).with_child({
name = TextBuilder::new(
WidgetBuilder::new()
.with_horizontal_alignment(HorizontalAlignment::Center)
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text(self.name)
.build(ctx);
name = TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_horizontal_alignment(HorizontalAlignment::Center)
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text(self.name)
.build(ctx);
name
}))
.build(ctx),
Expand Down
30 changes: 16 additions & 14 deletions editor/src/audio/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,14 @@ impl AudioPanel {
WidgetBuilder::new()
.on_row(0)
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("DM")
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("DM")
.build(ctx),
)
.with_child({
distance_model = DropdownListBuilder::new(
Expand All @@ -271,13 +272,14 @@ impl AudioPanel {
distance_model
})
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("Renderer")
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("Renderer")
.build(ctx),
)
.with_child({
renderer = DropdownListBuilder::new(
Expand Down
28 changes: 15 additions & 13 deletions editor/src/audio/preview.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,14 @@ impl AudioPreviewPanel {
.with_margin(Thickness::uniform(1.0)),
)
.with_content(
TextBuilder::new(
WidgetBuilder::new()
.on_column(0)
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text("Preview")
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.on_column(0)
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text("Preview")
.build(ctx),
)
.build(ctx);
preview
Expand Down Expand Up @@ -127,12 +128,13 @@ impl AudioPreviewPanel {
WidgetBuilder::new()
.on_row(1)
.with_child(
TextBuilder::new(
WidgetBuilder::new().with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("Time, s")
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new().with_margin(Thickness::uniform(1.0)),
)
.with_vertical_text_alignment(VerticalAlignment::Center)
.with_text("Time, s")
.build(ctx),
)
.with_child({
time = ScrollBarBuilder::new(
Expand Down
27 changes: 14 additions & 13 deletions editor/src/command/panel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,20 @@ impl CommandStackViewer {
ui.style.property(Style::BRUSH_LIGHTEST)
};

TextBuilder::new(
WidgetBuilder::new()
.with_margin(Thickness {
left: 2.0,
top: 1.0,
right: 2.0,
bottom: 0.0,
})
.with_foreground(brush),
)
.with_text(name)
.build(&mut ui.build_ctx())
.to_base()
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_margin(Thickness {
left: 2.0,
top: 1.0,
right: 2.0,
bottom: 0.0,
})
.with_foreground(brush),
)
.with_text(name)
.build(&mut ui.build_ctx())
.to_base()
})
.collect();

Expand Down
44 changes: 25 additions & 19 deletions editor/src/configurator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ fn make_history_entry_widget(ctx: &mut BuildContext, entry: &HistoryEntry) -> Ha
bottom: 1.0,
})
.with_child(
TextBuilder::new(WidgetBuilder::new().with_margin(Thickness::left(5.0)))
TextBuilder::new()
.with_widget_builder(WidgetBuilder::new().with_margin(Thickness::left(5.0)))
.with_text(format!("{}", entry.work_dir.display(),))
.with_vertical_text_alignment(VerticalAlignment::Center)
.build(ctx),
Expand Down Expand Up @@ -143,7 +144,10 @@ impl Configurator {
WidgetBuilder::new()
.with_margin(Thickness::uniform(1.0))
.with_child(
TextBuilder::new(WidgetBuilder::new().with_margin(Thickness::uniform(1.0)))
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new().with_margin(Thickness::uniform(1.0)),
)
.with_text(message)
.with_wrap(WrapMode::Word)
.build(ctx),
Expand All @@ -153,15 +157,16 @@ impl Configurator {
WidgetBuilder::new()
.on_row(1)
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.on_row(0)
.on_column(0)
.with_margin(Thickness::uniform(1.0))
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text("Working Directory")
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.on_row(0)
.on_column(0)
.with_margin(Thickness::uniform(1.0))
.with_vertical_alignment(VerticalAlignment::Center),
)
.with_text("Working Directory")
.build(ctx),
)
.with_child({
tb_work_dir = TextBoxBuilder::new(
Expand Down Expand Up @@ -201,14 +206,15 @@ impl Configurator {
.build(ctx),
)
.with_child(
TextBuilder::new(
WidgetBuilder::new()
.with_margin(Thickness::uniform(5.0))
.on_row(2),
)
.with_text("Previous Configurations")
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.build(ctx),
TextBuilder::new()
.with_widget_builder(
WidgetBuilder::new()
.with_margin(Thickness::uniform(5.0))
.on_row(2),
)
.with_text("Previous Configurations")
.with_horizontal_text_alignment(HorizontalAlignment::Center)
.build(ctx),
)
.with_child({
lv_history = ListViewBuilder::new(
Expand Down
Loading
Loading