Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xamarin/Xamarin.PropertyEditing.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Maupin <me@ermau.com>2018-06-20 21:20:21 +0300
committerGitHub <noreply@github.com>2018-06-20 21:20:21 +0300
commit0cec86376f629b4dfc682797557a70c591fc1a84 (patch)
tree90fbde84a33a58f7ca7be90da87a05203c655368 /Xamarin.PropertyEditing.Windows
parent98acc9e749fae16f8b44b20da70b33289104a2fe (diff)
parentf0c7ecece729f4d88ec788462e2b19382ae4e735 (diff)
Merge pull request #327 from xamarin/bleroy-fix-brush-tab-focus
Fix double-focusable issue on brush tabs. Fixes #310
Diffstat (limited to 'Xamarin.PropertyEditing.Windows')
-rw-r--r--Xamarin.PropertyEditing.Windows/Themes/Resources.xaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml b/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
index 1f8f22c..068edb6 100644
--- a/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
+++ b/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
@@ -612,28 +612,28 @@
<local:BrushChoiceTemplateSelector.NoBrushTemplate>
<DataTemplate>
<RadioButton Style="{DynamicResource BrushChoiceItem}">
- <ContentControl ContentTemplate="{DynamicResource BrushChoiceNoBrushIcon}"/>
+ <ContentControl ContentTemplate="{DynamicResource BrushChoiceNoBrushIcon}" Focusable="False"/>
</RadioButton>
</DataTemplate>
</local:BrushChoiceTemplateSelector.NoBrushTemplate>
<local:BrushChoiceTemplateSelector.SolidBrushTemplate>
<DataTemplate>
<RadioButton Style="{DynamicResource BrushChoiceItem}">
- <ContentControl ContentTemplate="{DynamicResource BrushChoiceSolidBrushIcon}"/>
+ <ContentControl ContentTemplate="{DynamicResource BrushChoiceSolidBrushIcon}" Focusable="False"/>
</RadioButton>
</DataTemplate>
</local:BrushChoiceTemplateSelector.SolidBrushTemplate>
<local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
<DataTemplate>
<RadioButton Style="{DynamicResource BrushChoiceItem}">
- <ContentControl ContentTemplate="{DynamicResource BrushChoiceMaterialDesignIcon}"/>
+ <ContentControl ContentTemplate="{DynamicResource BrushChoiceMaterialDesignIcon}" Focusable="False"/>
</RadioButton>
</DataTemplate>
</local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
<local:BrushChoiceTemplateSelector.ResourceBrushTemplate>
<DataTemplate>
<RadioButton Style="{DynamicResource BrushChoiceItem}">
- <ContentControl ContentTemplate="{DynamicResource BrushChoiceResourceBrushIcon}"/>
+ <ContentControl ContentTemplate="{DynamicResource BrushChoiceResourceBrushIcon}" Focusable="False"/>
</RadioButton>
</DataTemplate>
</local:BrushChoiceTemplateSelector.ResourceBrushTemplate>