@@ -76,7 +76,7 @@ use crate::{
7676 rect:: RectPropertyEditorDefinition ,
7777 refcell:: RefCellPropertyEditorDefinition ,
7878 string:: StringPropertyEditorDefinition ,
79- style:: StyledPropertyEditorDefinition ,
79+ style:: StyledPropertyNameEditorDefinition ,
8080 texture_slice:: TextureSlicePropertyEditorDefinition ,
8181 utf32:: Utf32StringPropertyEditorDefinition ,
8282 uuid:: UuidPropertyEditorDefinition ,
@@ -705,20 +705,17 @@ impl PropertyEditorDefinitionContainer {
705705
706706 // Styled.
707707 container. insert ( InheritablePropertyEditorDefinition :: < StyledProperty < f32 > > :: new ( ) ) ;
708- container. insert ( StyledPropertyEditorDefinition :: < f32 > :: new ( ) ) ;
708+ container. insert ( StyledPropertyNameEditorDefinition ) ;
709709
710710 container. insert ( InheritablePropertyEditorDefinition :: < StyledProperty < Color > > :: new ( ) ) ;
711- container. insert ( StyledPropertyEditorDefinition :: < Color > :: new ( ) ) ;
712711
713712 container. insert ( InheritablePropertyEditorDefinition :: <
714713 StyledProperty < Thickness > ,
715714 > :: new ( ) ) ;
716- container. insert ( StyledPropertyEditorDefinition :: < Thickness > :: new ( ) ) ;
717715
718716 container. insert ( InheritablePropertyEditorDefinition :: <
719717 StyledProperty < TextureResource > ,
720718 > :: new ( ) ) ;
721- container. insert ( StyledPropertyEditorDefinition :: < TextureResource > :: new ( ) ) ;
722719 container. insert ( VecCollectionPropertyEditorDefinition :: <
723720 StylePropertyContainer ,
724721 > :: new ( ) ) ;
@@ -939,7 +936,7 @@ impl PropertyEditorDefinitionContainer {
939936
940937 pub fn register_inheritable_styleable_inspectable < T > ( & self )
941938 where
942- T : Reflect + Clone + PartialEq ,
939+ T : Reflect + Clone + PartialEq + Default + Send ,
943940 {
944941 assert ! (
945942 self . insert( InspectablePropertyEditorDefinition :: <T >:: new( ) )
@@ -954,7 +951,7 @@ impl PropertyEditorDefinitionContainer {
954951 . is_none( )
955952 ) ;
956953 assert ! (
957- self . insert( StyledPropertyEditorDefinition :: <T >:: new( ) )
954+ self . insert( EnumPropertyEditorDefinition :: <StyledProperty < T > >:: new( ) )
958955 . is_none( )
959956 ) ;
960957 }
@@ -989,7 +986,14 @@ impl PropertyEditorDefinitionContainer {
989986
990987 pub fn register_inheritable_styleable_enum < T , E : Debug > ( & self )
991988 where
992- T : InspectableEnum + VariantNames + AsRef < str > + FromStr < Err = E > + Debug + PartialEq ,
989+ T : InspectableEnum
990+ + VariantNames
991+ + AsRef < str >
992+ + FromStr < Err = E >
993+ + Debug
994+ + PartialEq
995+ + Default
996+ + Send ,
993997 {
994998 assert ! (
995999 self . insert( EnumPropertyEditorDefinition :: <T >:: new( ) )
@@ -1004,7 +1008,7 @@ impl PropertyEditorDefinitionContainer {
10041008 . is_none( )
10051009 ) ;
10061010 assert ! (
1007- self . insert( StyledPropertyEditorDefinition :: <T >:: new( ) )
1011+ self . insert( EnumPropertyEditorDefinition :: <StyledProperty < T > >:: new( ) )
10081012 . is_none( )
10091013 ) ;
10101014 }
0 commit comments