Merge pull request #4220 from bolyb/combobox-triple-click-fix

Improving ComboBoxColumn behavior to prevent triple click behavior
CommunityToolkit · Sep 2, 2021 · 0ee2c84 · 0ee2c84
2 parents e4b8a68 + 8273bca
commit 0ee2c84
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
@@ -383,7 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u
         /// <returns>The unedited value. </returns>
         protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
         {
-            return (editingElement as ComboBox)?.SelectedItem;
+            if(editingElement is ComboBox comboBox)
+            {
+                comboBox.IsDropDownOpen = true;
+                return comboBox.SelectedItem;
+            }
+
+            return null;
         }
 
         /// <summary>