Merge pull request #612 from stigrune/popupboxbugfix

Only allow focus on the ToggleButton in the PopupBox templates

Author: ButchersBoy

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml

@@ -25,6 +25,7 @@
         <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth3" />
         <Setter Property="TextElement.FontWeight" Value="Normal" />
         <Setter Property="Padding" Value="0 8 0 8" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpf:PopupBox}">
@@ -160,6 +161,7 @@
         <Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth2" />
         <Setter Property="Width" Value="56" />
         <Setter Property="Height" Value="56" />
+        <Setter Property="Focusable" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpf:PopupBox}">
@@ -235,7 +237,7 @@
                                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
                                                 <!-- additional layer so we don't rotate the ripple directly which can cause jumpyness under certain layouts -->
                                                 <ContentControl Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                RenderTransformOrigin=".5,.5">
+                                                                RenderTransformOrigin=".5,.5" Focusable="False">
                                                     <ContentControl.RenderTransform>
                                                         <RotateTransform x:Name="ContentRotateTransform" Angle="0" />
                                                     </ContentControl.RenderTransform>
@@ -316,13 +318,14 @@
                                       ToolTipService.Placement="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=wpf:PopupBox}, Path=(ToolTipService.Placement)}">
                             <Grid>
                                 <ContentControl x:Name="StandardToggleContent" Content="{TemplateBinding ToggleContent}" ContentTemplate="{TemplateBinding ToggleContentTemplate}"
-                                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={StaticResource InvertedNullVisibilityConverter}}"/>
+                                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={StaticResource InvertedNullVisibilityConverter}}" Focusable="False"/>
                                 <ContentControl x:Name="ExplicitToggleContent" Content="{TemplateBinding ToggleContent}" ContentTemplate="{TemplateBinding ToggleContentTemplate}"
-                                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={StaticResource NullVisibilityConverter}}"/>
+                                                Visibility="{TemplateBinding ToggleCheckedContent, Converter={StaticResource NullVisibilityConverter}}" Focusable="False"/>
                                 <ContentControl x:Name="ExplicitToggleCheckedContent" Content="{TemplateBinding ToggleCheckedContent}" ContentTemplate="{TemplateBinding ToggleCheckedContentTemplate}"
                                                 Visibility="{TemplateBinding ToggleCheckedContent, Converter={StaticResource NullVisibilityConverter}}"
                                                 Opacity="0"
-                                                RenderTransformOrigin=".5,.5">
+                                                RenderTransformOrigin=".5,.5"
+                                                Focusable="False">
                                     <ContentControl.RenderTransform>
                                         <RotateTransform Angle="-45" />
                                     </ContentControl.RenderTransform>