diff options
| author | E.Z. Hart <hartez@users.noreply.github.com> | 2016-08-16 12:10:32 -0600 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-08-16 11:10:32 -0700 |
| commit | 30c0dcb949186c21c60c4c9ddf8a581d40a43662 (patch) | |
| tree | 17a196012b9d4044f78cc0acbe9aa137d10f2b25 /Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs | |
| parent | 966683a807f68f302e8f121279387109f2a4a73b (diff) | |
| download | xamarin-forms-30c0dcb949186c21c60c4c9ddf8a581d40a43662.tar.gz xamarin-forms-30c0dcb949186c21c60c4c9ddf8a581d40a43662.tar.bz2 xamarin-forms-30c0dcb949186c21c60c4c9ddf8a581d40a43662.zip | |
Fix Entry/SearchBar color issues (#306)
* Fix disappearing Entry text on UWP Anniversary Edition
Fix background color reversion bug in UWP Phone
Move SearchBar styling on UWP to its own file
Make foreground/background color changes on UWP SearchBar/Entry consistent
Fix SearchBar color toggle bug on WP8
* Temporarily moving SDK target to previous version
* Fix build error on OSX
Diffstat (limited to 'Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs')
| -rw-r--r-- | Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs b/Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs index a71041da..b37978d0 100644 --- a/Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs +++ b/Xamarin.Forms.Platform.WP8/SearchBarRenderer.cs @@ -117,20 +117,8 @@ namespace Xamarin.Forms.Platform.WinPhone void UpdatePlaceholderColor() { - Color placeholderColor = Element.PlaceholderColor; - - if (placeholderColor.IsDefault) - { - if (_defaultPlaceholderColorBrush == null) - return; - - Control.PlaceholderForegroundBrush = _defaultPlaceholderColorBrush; - } - - if (_defaultPlaceholderColorBrush == null) - _defaultPlaceholderColorBrush = Control.PlaceholderForegroundBrush; - - Control.PlaceholderForegroundBrush = placeholderColor.ToBrush(); + BrushHelpers.UpdateColor(Element.PlaceholderColor, ref _defaultPlaceholderColorBrush, + () => Control.PlaceholderForegroundBrush, brush => Control.PlaceholderForegroundBrush = brush); } void UpdateText() @@ -140,20 +128,12 @@ namespace Xamarin.Forms.Platform.WinPhone void UpdateTextColor() { - Color textColor = Element.TextColor; - - if (textColor.IsDefault) - { - if (_defaultTextColorBrush == null) - return; - - Control.Foreground = _defaultTextColorBrush; - } - - if (_defaultTextColorBrush == null) - _defaultTextColorBrush = Control.Foreground; - - Control.Foreground = textColor.ToBrush(); + BrushHelpers.UpdateColor(Element.TextColor, ref _defaultTextColorBrush, + () => Control.Foreground, brush => Control.Foreground = brush); + + // Force the PhoneTextBox control to do some internal bookkeeping + // so the colors change immediately and remain changed when the control gets focus + Control.OnApplyTemplate(); } } }
\ No newline at end of file |