surround Flyout content with AdornerDecorator fixes incorrect FocusVi…

…sualStyle
MahApps · Feb 24, 2015 · dc58b92 · dc58b92
1 parent cc0aef8
commit dc58b92
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/MahApps.Metro/Themes/Flyout.xaml b/MahApps.Metro/Themes/Flyout.xaml
@@ -220,16 +220,17 @@
                     </VisualState>
                 </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <DockPanel FocusVisualStyle="{x:Null}"
-                       Focusable="False">
-                <ContentPresenter x:Name="PART_Header"
-                                  DockPanel.Dock="Top"
-                                  ContentSource="Header"
-                                  ContentTemplate="{TemplateBinding HeaderTemplate}" />
-                <ContentPresenter x:Name="PART_Content"
-                                  DockPanel.Dock="Bottom">
-                </ContentPresenter>
-            </DockPanel>
+            <AdornerDecorator>
+                <DockPanel FocusVisualStyle="{x:Null}"
+                           Focusable="False">
+                    <ContentPresenter x:Name="PART_Header"
+                                      DockPanel.Dock="Top"
+                                      ContentSource="Header"
+                                      ContentTemplate="{TemplateBinding HeaderTemplate}" />
+                    <ContentPresenter x:Name="PART_Content"
+                                      DockPanel.Dock="Bottom" />
+                </DockPanel>
+            </AdornerDecorator>
         </Grid>
         <ControlTemplate.Triggers>
             <DataTrigger Binding="{Binding Position, RelativeSource={RelativeSource Self}}"