Skip to content

Commit 0265d73

Browse files
committed
typed handles for UuidEditor widget
1 parent 84d8913 commit 0265d73

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

fyrox-ui/src/inspector/editors/uuid.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ impl PropertyEditorDefinition for UuidPropertyEditorDefinition {
4747
ctx: PropertyEditorBuildContext,
4848
) -> Result<PropertyEditorInstance, InspectorError> {
4949
let value = ctx.property_info.cast_value::<Uuid>()?;
50-
Ok(PropertyEditorInstance::Simple {
51-
editor: UuidEditorBuilder::new(
50+
Ok(PropertyEditorInstance::simple(
51+
UuidEditorBuilder::new(
5252
WidgetBuilder::new()
5353
.with_margin(Thickness::uniform(1.0))
5454
.with_vertical_alignment(VerticalAlignment::Center),
5555
)
5656
.with_value(*value)
5757
.build(ctx.build_context),
58-
})
58+
))
5959
}
6060

6161
fn create_message(

fyrox-ui/src/uuid.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ impl ConstructorProvider<UiNode, UserInterface> for UuidEditor {
8181
.with_variant("Uuid Editor", |ui| {
8282
UuidEditorBuilder::new(WidgetBuilder::new().with_name("Uuid Editor"))
8383
.build(&mut ui.build_ctx())
84+
.to_base()
8485
.into()
8586
})
8687
.with_group("Input")
@@ -129,7 +130,7 @@ impl UuidEditorBuilder {
129130
}
130131

131132
/// Finishes widget building.
132-
pub fn build(self, ctx: &mut BuildContext) -> Handle<UiNode> {
133+
pub fn build(self, ctx: &mut BuildContext) -> Handle<UuidEditor> {
133134
let text;
134135
let generate;
135136
let grid = GridBuilder::new(
@@ -171,7 +172,7 @@ impl UuidEditorBuilder {
171172
generate,
172173
};
173174

174-
ctx.add_node(UiNode::new(uuid_editor))
175+
ctx.add_node(UiNode::new(uuid_editor)).to_variant()
175176
}
176177
}
177178

0 commit comments

Comments
 (0)