Skip to content

Commit 11c3c0d

Browse files
KebooKeboo
authored
Forwarding Font properties. (#2060)
1 parent e3cfc89 commit 11c3c0d

File tree

1 file changed

+100
-40
lines changed

1 file changed

+100
-40
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ListBox.xaml‎

Lines changed: 100 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,12 @@
371371
Content="{TemplateBinding Content}"
372372
ContentTemplate="{TemplateBinding ContentTemplate}"
373373
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
374-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
374+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
375+
FontFamily="{TemplateBinding FontFamily}"
376+
FontSize="{TemplateBinding FontSize}"
377+
FontStretch="{TemplateBinding FontStretch}"
378+
FontStyle="{TemplateBinding FontStyle}"
379+
FontWeight="{TemplateBinding FontWeight}"/>
375380
</ControlTemplate>
376381
</Setter.Value>
377382
</Setter>
@@ -436,7 +441,12 @@
436441
Content="{TemplateBinding Content}"
437442
ContentTemplate="{TemplateBinding ContentTemplate}"
438443
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
439-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
444+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
445+
FontFamily="{TemplateBinding FontFamily}"
446+
FontSize="{TemplateBinding FontSize}"
447+
FontStretch="{TemplateBinding FontStretch}"
448+
FontStyle="{TemplateBinding FontStyle}"
449+
FontWeight="{TemplateBinding FontWeight}"/>
440450
</ControlTemplate>
441451
</Setter.Value>
442452
</Setter>
@@ -455,7 +465,12 @@
455465
Content="{TemplateBinding Content}"
456466
ContentTemplate="{TemplateBinding ContentTemplate}"
457467
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
458-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
468+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
469+
FontFamily="{TemplateBinding FontFamily}"
470+
FontSize="{TemplateBinding FontSize}"
471+
FontStretch="{TemplateBinding FontStretch}"
472+
FontStyle="{TemplateBinding FontStyle}"
473+
FontWeight="{TemplateBinding FontWeight}"/>
459474
</ControlTemplate>
460475
</Setter.Value>
461476
</Setter>
@@ -474,7 +489,12 @@
474489
Content="{TemplateBinding Content}"
475490
ContentTemplate="{TemplateBinding ContentTemplate}"
476491
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
477-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
492+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
493+
FontFamily="{TemplateBinding FontFamily}"
494+
FontSize="{TemplateBinding FontSize}"
495+
FontStretch="{TemplateBinding FontStretch}"
496+
FontStyle="{TemplateBinding FontStyle}"
497+
FontWeight="{TemplateBinding FontWeight}"/>
478498
</ControlTemplate>
479499
</Setter.Value>
480500
</Setter>
@@ -493,6 +513,11 @@
493513
Content="{TemplateBinding Content}"
494514
ContentTemplate="{TemplateBinding ContentTemplate}"
495515
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
516+
FontFamily="{TemplateBinding FontFamily}"
517+
FontSize="{TemplateBinding FontSize}"
518+
FontStretch="{TemplateBinding FontStretch}"
519+
FontStyle="{TemplateBinding FontStyle}"
520+
FontWeight="{TemplateBinding FontWeight}"
496521
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
497522
</ControlTemplate>
498523
</Setter.Value>
@@ -512,6 +537,11 @@
512537
Content="{TemplateBinding Content}"
513538
ContentTemplate="{TemplateBinding ContentTemplate}"
514539
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
540+
FontFamily="{TemplateBinding FontFamily}"
541+
FontSize="{TemplateBinding FontSize}"
542+
FontStretch="{TemplateBinding FontStretch}"
543+
FontStyle="{TemplateBinding FontStyle}"
544+
FontWeight="{TemplateBinding FontWeight}"
515545
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"/>
516546
</ControlTemplate>
517547
</Setter.Value>
@@ -527,12 +557,17 @@
527557
<Setter.Value>
528558
<ControlTemplate TargetType="{x:Type ListBoxItem}">
529559
<RadioButton Style="{StaticResource MaterialDesignChoiceChipRadioButton}"
530-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
531-
Content="{TemplateBinding Content}"
532-
ContentTemplate="{TemplateBinding ContentTemplate}"
533-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
534-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
535-
GroupName="{Binding RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
560+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
561+
Content="{TemplateBinding Content}"
562+
ContentTemplate="{TemplateBinding ContentTemplate}"
563+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
564+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
565+
FontFamily="{TemplateBinding FontFamily}"
566+
FontSize="{TemplateBinding FontSize}"
567+
FontStretch="{TemplateBinding FontStretch}"
568+
FontStyle="{TemplateBinding FontStyle}"
569+
FontWeight="{TemplateBinding FontWeight}"
570+
GroupName="{Binding RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
536571
</ControlTemplate>
537572
</Setter.Value>
538573
</Setter>
@@ -548,12 +583,17 @@
548583
<Setter.Value>
549584
<ControlTemplate TargetType="{x:Type ListBoxItem}">
550585
<RadioButton Style="{StaticResource MaterialDesignChoiceChipPrimaryRadioButton}"
551-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
552-
Content="{TemplateBinding Content}"
553-
ContentTemplate="{TemplateBinding ContentTemplate}"
554-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
555-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
556-
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
586+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
587+
Content="{TemplateBinding Content}"
588+
ContentTemplate="{TemplateBinding ContentTemplate}"
589+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
590+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
591+
FontFamily="{TemplateBinding FontFamily}"
592+
FontSize="{TemplateBinding FontSize}"
593+
FontStretch="{TemplateBinding FontStretch}"
594+
FontStyle="{TemplateBinding FontStyle}"
595+
FontWeight="{TemplateBinding FontWeight}"
596+
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
557597
</ControlTemplate>
558598
</Setter.Value>
559599
</Setter>
@@ -568,12 +608,17 @@
568608
<Setter.Value>
569609
<ControlTemplate TargetType="{x:Type ListBoxItem}">
570610
<RadioButton Style="{StaticResource MaterialDesignChoiceChipAccentRadioButton}"
571-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
572-
Content="{TemplateBinding Content}"
573-
ContentTemplate="{TemplateBinding ContentTemplate}"
574-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
575-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
576-
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
611+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
612+
Content="{TemplateBinding Content}"
613+
ContentTemplate="{TemplateBinding ContentTemplate}"
614+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
615+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
616+
FontFamily="{TemplateBinding FontFamily}"
617+
FontSize="{TemplateBinding FontSize}"
618+
FontStretch="{TemplateBinding FontStretch}"
619+
FontStyle="{TemplateBinding FontStyle}"
620+
FontWeight="{TemplateBinding FontWeight}"
621+
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
577622
</ControlTemplate>
578623
</Setter.Value>
579624
</Setter>
@@ -588,12 +633,17 @@
588633
<Setter.Value>
589634
<ControlTemplate TargetType="{x:Type ListBoxItem}">
590635
<RadioButton Style="{StaticResource MaterialDesignChoiceChipOutlineRadioButton}"
591-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
592-
Content="{TemplateBinding Content}"
593-
ContentTemplate="{TemplateBinding ContentTemplate}"
594-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
595-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
596-
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
636+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
637+
Content="{TemplateBinding Content}"
638+
ContentTemplate="{TemplateBinding ContentTemplate}"
639+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
640+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
641+
FontFamily="{TemplateBinding FontFamily}"
642+
FontSize="{TemplateBinding FontSize}"
643+
FontStretch="{TemplateBinding FontStretch}"
644+
FontStyle="{TemplateBinding FontStyle}"
645+
FontWeight="{TemplateBinding FontWeight}"
646+
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
597647
</ControlTemplate>
598648
</Setter.Value>
599649
</Setter>
@@ -608,12 +658,17 @@
608658
<Setter.Value>
609659
<ControlTemplate TargetType="{x:Type ListBoxItem}">
610660
<RadioButton Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineRadioButton}"
611-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
612-
Content="{TemplateBinding Content}"
613-
ContentTemplate="{TemplateBinding ContentTemplate}"
614-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
615-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
616-
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
661+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
662+
Content="{TemplateBinding Content}"
663+
ContentTemplate="{TemplateBinding ContentTemplate}"
664+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
665+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
666+
FontFamily="{TemplateBinding FontFamily}"
667+
FontSize="{TemplateBinding FontSize}"
668+
FontStretch="{TemplateBinding FontStretch}"
669+
FontStyle="{TemplateBinding FontStyle}"
670+
FontWeight="{TemplateBinding FontWeight}"
671+
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
617672
</ControlTemplate>
618673
</Setter.Value>
619674
</Setter>
@@ -628,12 +683,17 @@
628683
<Setter.Value>
629684
<ControlTemplate TargetType="{x:Type ListBoxItem}">
630685
<RadioButton Style="{StaticResource MaterialDesignChoiceChipAccentOutlineRadioButton}"
631-
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
632-
Content="{TemplateBinding Content}"
633-
ContentTemplate="{TemplateBinding ContentTemplate}"
634-
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
635-
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
636-
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
686+
IsChecked="{Binding IsSelected, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=TwoWay}"
687+
Content="{TemplateBinding Content}"
688+
ContentTemplate="{TemplateBinding ContentTemplate}"
689+
ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
690+
ContentStringFormat="{TemplateBinding ContentTemplateSelector}"
691+
FontFamily="{TemplateBinding FontFamily}"
692+
FontSize="{TemplateBinding FontSize}"
693+
FontStretch="{TemplateBinding FontStretch}"
694+
FontStyle="{TemplateBinding FontStyle}"
695+
FontWeight="{TemplateBinding FontWeight}"
696+
GroupName="{Binding Name, RelativeSource={RelativeSource AncestorType={x:Type ListBox}}}"/>
637697
</ControlTemplate>
638698
</Setter.Value>
639699
</Setter>

0 commit comments

Comments
 (0)