Merge remote-tracking branch 'origin/main' into app-menus

This commit is contained in:
Nathan Sobo 2023-12-05 16:54:38 -07:00
commit d2fe9f8f9b
33 changed files with 1021 additions and 738 deletions

View file

@ -2816,3 +2816,9 @@ impl From<(&'static str, EntityId)> for ElementId {
ElementId::NamedInteger(name.into(), id.as_u64() as usize)
}
}
impl From<(&'static str, usize)> for ElementId {
fn from((name, id): (&'static str, usize)) -> Self {
ElementId::NamedInteger(name.into(), id)
}
}