diff options
| author | Eric Maupin <me@ermau.com> | 2018-03-02 22:49:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 22:49:36 +0300 |
| commit | fdc7f77a648c336b955476ca5d362487b220647b (patch) | |
| tree | fc9e0c79589b5905762a10433e44b11a2279e3b7 /Xamarin.PropertyEditing.Windows | |
| parent | 575bbe30253e77e0da5e1e2908fde328711772bb (diff) | |
| parent | e63606dbbcee6d2e5c5daf006b82ea65b7fdc39f (diff) | |
Merge pull request #243 from xamarin/ermau-fix-custom-expression-popup
Fix custom expression popup
Diffstat (limited to 'Xamarin.PropertyEditing.Windows')
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/EntryPopup.cs | 3 | ||||
| -rw-r--r-- | Xamarin.PropertyEditing.Windows/PropertyButton.cs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Xamarin.PropertyEditing.Windows/EntryPopup.cs b/Xamarin.PropertyEditing.Windows/EntryPopup.cs index fa5c73f..fbc3a05 100644 --- a/Xamarin.PropertyEditing.Windows/EntryPopup.cs +++ b/Xamarin.PropertyEditing.Windows/EntryPopup.cs @@ -60,6 +60,9 @@ namespace Xamarin.PropertyEditing.Windows private void UpdateContentTemplate() { Child = ContentTemplate?.LoadContent() as UIElement; + if (Child == null) + return; + this.textBox = ((FrameworkElement)Child)?.FindName ("entry") as TextBox; if (this.textBox == null) throw new InvalidOperationException ("Need an entry TextBox for EntryPopup"); diff --git a/Xamarin.PropertyEditing.Windows/PropertyButton.cs b/Xamarin.PropertyEditing.Windows/PropertyButton.cs index 985d229..41cd0cc 100644 --- a/Xamarin.PropertyEditing.Windows/PropertyButton.cs +++ b/Xamarin.PropertyEditing.Windows/PropertyButton.cs @@ -176,7 +176,8 @@ namespace Xamarin.PropertyEditing.Windows var popup = new EntryPopup { Placement = PlacementMode.Bottom, PlacementTarget = this.indicator, - DataContext = DataContext + DataContext = DataContext, + StaysOpen = false }; popup.SetResourceReference (Popup.StyleProperty, "CustomExpressionPopup"); |