@@ -183,6 +183,15 @@ public double LabelSize
183183 set { SetValue ( LabelSizeProperty , value ) ; }
184184 }
185185
186+ public static readonly BindableProperty LabelFontFamilyProperty =
187+ BindableProperty . Create ( nameof ( LabelFontFamily ) , typeof ( string ) , typeof ( BaseMaterialFieldControl ) , defaultValue : null ) ;
188+
189+ public string LabelFontFamily
190+ {
191+ get { return ( string ) GetValue ( LabelFontFamilyProperty ) ; }
192+ set { SetValue ( LabelFontFamilyProperty , value ) ; }
193+ }
194+
186195 public static readonly BindableProperty LabelMarginProperty =
187196 BindableProperty . Create ( nameof ( LabelMargin ) , typeof ( Thickness ) , typeof ( BaseMaterialFieldControl ) , defaultValue : new Thickness ( 14 , 0 , 14 , 2 ) ) ;
188197
@@ -223,6 +232,15 @@ public double AssistiveSize
223232 set { SetValue ( AssistiveSizeProperty , value ) ; }
224233 }
225234
235+ public static readonly BindableProperty AssistiveFontFamilyProperty =
236+ BindableProperty . Create ( nameof ( AssistiveFontFamily ) , typeof ( string ) , typeof ( BaseMaterialFieldControl ) , defaultValue : null ) ;
237+
238+ public string AssistiveFontFamily
239+ {
240+ get { return ( string ) GetValue ( AssistiveFontFamilyProperty ) ; }
241+ set { SetValue ( AssistiveFontFamilyProperty , value ) ; }
242+ }
243+
226244 public static readonly BindableProperty AssistiveMarginProperty =
227245 BindableProperty . Create ( nameof ( AssistiveMargin ) , typeof ( Thickness ) , typeof ( BaseMaterialFieldControl ) , defaultValue : new Thickness ( 14 , 2 , 14 , 0 ) ) ;
228246
@@ -458,9 +476,23 @@ protected void UpdateLayout(string propertyName, Label lblLabel, Label lblAssist
458476 SetFontSize ( ) ;
459477 break ;
460478 case nameof ( FontFamily ) :
479+ case nameof ( LabelFontFamily ) :
480+ case nameof ( AssistiveFontFamily ) :
461481 SetFontFamily ( ) ;
462- lblLabel . FontFamily = FontFamily ;
463- lblAssistive . FontFamily = FontFamily ;
482+
483+ if ( LabelFontFamily != null )
484+ lblLabel . FontFamily = LabelFontFamily ;
485+ else if ( LabelFontFamily == null && FontFamily != null )
486+ lblLabel . FontFamily = FontFamily ;
487+
488+ if ( AssistiveFontFamily != null )
489+ lblAssistive . FontFamily = AssistiveFontFamily ;
490+ else if ( AssistiveFontFamily == null && FontFamily != null )
491+ lblAssistive . FontFamily = FontFamily ;
492+
493+
494+ //lblLabel.FontFamily = FontFamily;
495+ //lblAssistive.FontFamily = FontFamily;
464496 break ;
465497 case nameof ( Placeholder ) :
466498 SetPlaceholder ( ) ;
0 commit comments