Fixes #1091 (#1206)

Toggle button inside of the popup box template should inherit the PopupBox's TabIndex

Author: Keboo

MaterialDesignThemes.Wpf.Tests/MaterialDesignThemes.Wpf.Tests.csproj

@@ -49,6 +49,7 @@
     <Compile Include="DialogHostTests.cs" />
     <Compile Include="MdixHelper.cs" />
     <Compile Include="PaletteHelperFixture.cs" />
+    <Compile Include="PopupBoxTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="VisualTreeHelper.cs" />
   </ItemGroup>

MaterialDesignThemes.Wpf.Tests/PopupBoxTests.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using Xunit;
+
+namespace MaterialDesignThemes.Wpf.Tests
+{
+    public class PopupBoxTests
+    {
+        [StaFact]
+        [Description("Issue 1091")]
+        public void ToggleButtonInheritsTabIndex()
+        {
+            var popupBox = new PopupBox { TabIndex = 3 };
+            popupBox.ApplyDefaultStyle();
+
+            ToggleButton togglePart = popupBox.FindVisualChild<ToggleButton>(PopupBox.TogglePartName);
+            
+            Assert.Equal(3, togglePart.TabIndex);
+        }
+    }
+}

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.PopupBox.xaml

@@ -73,7 +73,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="Focusable" Value="True" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type wpf:PopupBox}">
@@ -98,8 +98,7 @@
                     <Grid>
                         <ToggleButton x:Name="PART_Toggle" Style="{StaticResource ToggleButtonStyle}" IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}"
                                       Content="{TemplateBinding ToggleContent}" ContentTemplate="{TemplateBinding ToggleContentTemplate}"
-                                      Cursor="Hand"
-                                      VerticalAlignment="Center"
+                                      Cursor="Hand" TabIndex="{TemplateBinding TabIndex}" VerticalAlignment="Center"
                                       />
                         <controlzEx:PopupEx x:Name="PART_Popup" 
                                             IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPopupOpen, Mode=TwoWay}"

MaterialDesignToolkit.Wpf.sln.DotSettings

@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Controlz/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Templated/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>