Fix stopping at Card icon #718

lepoco · Aug 15, 2023 · 00d742f · 00d742f
1 parent 50ae4c8
commit 00d742f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/Wpf.Ui/Styles/Controls/CardAction.xaml b/src/Wpf.Ui/Styles/Controls/CardAction.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -82,8 +82,10 @@
                                 Margin="{StaticResource CardActionIconMargin}"
                                 VerticalAlignment="Center"
                                 Filled="{TemplateBinding IconFilled}"
+                                Focusable="False"
                                 FontSize="{StaticResource CardActionIconSize}"
                                 Foreground="{TemplateBinding IconForeground}"
+                                KeyboardNavigation.IsTabStop="False"
                                 Symbol="{TemplateBinding Icon}" />
                             <ContentPresenter
                                 x:Name="ContentPresenter"

diff --git a/src/Wpf.Ui/Styles/Controls/CardControl.xaml b/src/Wpf.Ui/Styles/Controls/CardControl.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
     This Source Code Form is subject to the terms of the MIT License.
     If a copy of the MIT was not distributed with this file, You can obtain one at https://opensource.org/licenses/MIT.
     Copyright (C) Leszek Pomianowski and WPF UI Contributors.
@@ -81,8 +81,10 @@
                                 Margin="{StaticResource CardControlIconMargin}"
                                 VerticalAlignment="Center"
                                 Filled="{TemplateBinding IconFilled}"
+                                Focusable="False"
                                 FontSize="{StaticResource CardControlIconSize}"
                                 Foreground="{TemplateBinding IconForeground}"
+                                KeyboardNavigation.IsTabStop="False"
                                 Symbol="{TemplateBinding Icon}" />
                             <ContentPresenter
                                 x:Name="HeaderContentPresenter"

diff --git a/src/Wpf.Ui/Styles/Controls/CardExpander.xaml b/src/Wpf.Ui/Styles/Controls/CardExpander.xaml
@@ -159,6 +159,7 @@
                                             Focusable="False"
                                             FontSize="{StaticResource CardExpanderIconSize}"
                                             Foreground="{TemplateBinding Foreground}"
+                                            KeyboardNavigation.IsTabStop="False"
                                             Symbol="{TemplateBinding Icon}" />
 
                                         <ContentPresenter