From 01566fa0a8766b8c795ea3c999a1da275777e205 Mon Sep 17 00:00:00 2001 From: tznind Date: Wed, 17 Feb 2021 21:08:35 +0000 Subject: [PATCH] Fixed GetAllSelectedObjects including SelectedObject when it is hidden by branch collapsing --- Terminal.Gui/Views/TreeView.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Terminal.Gui/Views/TreeView.cs b/Terminal.Gui/Views/TreeView.cs index 144b9c502..04bdb8d33 100644 --- a/Terminal.Gui/Views/TreeView.cs +++ b/Terminal.Gui/Views/TreeView.cs @@ -1063,17 +1063,17 @@ namespace Terminal.Gui { { var map = BuildLineMap(); - if(SelectedObject != null) - yield return SelectedObject; - // To determine multi selected objects, start with the line map, that avoids yielding hidden nodes that were selected then the parent collapsed e.g. programmatically or with mouse click if(MultiSelect){ foreach(var m in map.Select(b=>b.Model).Where(IsSelected)){ - if(m != SelectedObject){ - yield return m; - } + yield return m; } } + else + { + if(SelectedObject != null) + yield return SelectedObject; + } } ///