summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.WinRT.Phone
diff options
context:
space:
mode:
authorPaul DiPietro <pauldipietro@users.noreply.github.com>2017-03-03 06:31:46 -0600
committerRui Marinho <me@ruimarinho.net>2017-03-03 12:31:46 +0000
commit8871077f115e7ef4d15efaa418fd718089db42c7 (patch)
tree91faf77329b6c1be984f36665ea80d6ae6a57589 /Xamarin.Forms.Platform.WinRT.Phone
parent38c0b34e91e2148e78704432afec6b086c9fc0c9 (diff)
downloadxamarin-forms-8871077f115e7ef4d15efaa418fd718089db42c7.tar.gz
xamarin-forms-8871077f115e7ef4d15efaa418fd718089db42c7.tar.bz2
xamarin-forms-8871077f115e7ef4d15efaa418fd718089db42c7.zip
[WinRT/UWP] Make TextBox better respect background color changes via behaviors (#749)
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT.Phone')
-rw-r--r--Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xaml b/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xaml
index 521a9059..3f3cced7 100644
--- a/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xaml
+++ b/Xamarin.Forms.Platform.WinRT.Phone/FormsTextBoxStyle.xaml
@@ -48,7 +48,10 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="ContentElement">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}"/>
</ObjectAnimationUsingKeyFrames>
- <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="PlaceholderTextContentPresenter">
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="ContentElement">
+ <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledBackgroundThemeBrush}" />
+ </ObjectAnimationUsingKeyFrames>
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="PlaceholderTextContentPresenter">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextBoxDisabledForegroundThemeBrush}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Foreground" Storyboard.TargetName="HeaderContentPresenter">
@@ -90,6 +93,7 @@
Grid.Row="0" Style="{StaticResource HeaderContentPresenterStyle}"/>
<ScrollViewer x:Name="ContentElement"
AutomationProperties.AccessibilityView="Raw"
+ Background="{Binding BackgroundFocusBrush, RelativeSource={RelativeSource TemplatedParent}}"
HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
IsTabStop="False"