From 4a57d4ddd02f23eeb5effefa14086b64609d9cee Mon Sep 17 00:00:00 2001 From: Andrey Kunchev Date: Wed, 31 Oct 2018 11:00:43 +0200 Subject: [PATCH] fix click on dropdown when dropdown in other popup fixes #2058 --- src/Avalonia.Controls/DropDown.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs index 5b7213257d..8596d06d2c 100644 --- a/src/Avalonia.Controls/DropDown.cs +++ b/src/Avalonia.Controls/DropDown.cs @@ -145,7 +145,7 @@ namespace Avalonia.Controls { if (!e.Handled) { - if (((IVisual)e.Source).GetVisualRoot() is PopupRoot) + if (_popup?.PopupRoot != null && ((IVisual)e.Source).GetVisualRoot() == _popup?.PopupRoot) { if (UpdateSelectionFromEventSource(e.Source)) {