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

michael-hawker · web-flow · commit 0ee2c842ba2e · 2021-09-02T15:30:42.000-07:00
Improving ComboBoxColumn behavior to prevent triple click behavior
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>

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u`
`383`	`383`	`/// <returns>The unedited value. </returns>`
`384`	`384`	`protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)`
`385`	`385`	`{`
`386`		`- return (editingElement as ComboBox)?.SelectedItem;`
	`386`	`+ if(editingElement is ComboBox comboBox)`
	`387`	`+ {`
	`388`	`+ comboBox.IsDropDownOpen = true;`
	`389`	`+ return comboBox.SelectedItem;`
	`390`	`+ }`
	`391`	`+`
	`392`	`+ return null;`
`387`	`393`	`}`
`388`	`394`
`389`	`395`	`/// <summary>`