Skip to content

Commit 98eecc7

Browse files
committed
Ensure RightTapped Event Only Applies to Rows
1 parent 612bd78 commit 98eecc7

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

Files UWP/Interacts/Interaction.cs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,23 @@ public void AllView_RightTapped(object sender, RightTappedRoutedEventArgs e)
262262
{
263263
dataGrid = (DataGrid)sender;
264264
var RowPressed = FindParent<DataGridRow>(e.OriginalSource as DependencyObject);
265-
var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)dataGrid.ItemsSource)[RowPressed.GetIndex()];
266-
// Check if RightTapped row is currently selected
267-
var CurrentInstance = ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>();
268-
foreach (ListedItem listedItem in (CurrentInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedItems)
265+
if(RowPressed != null)
269266
{
270-
if (RowPressed.GetIndex() == listedItem.RowIndex)
267+
var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)dataGrid.ItemsSource)[RowPressed.GetIndex()];
268+
// Check if RightTapped row is currently selected
269+
var CurrentInstance = ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>();
270+
foreach (ListedItem listedItem in (CurrentInstance.accessibleContentFrame.Content as GenericFileBrowser).data.SelectedItems)
271271
{
272-
return;
272+
if (RowPressed.GetIndex() == listedItem.RowIndex)
273+
{
274+
return;
275+
}
273276
}
277+
// The following code is only reachable when a user RightTapped an unselected row
278+
dataGrid.SelectedItems.Clear();
279+
dataGrid.SelectedItems.Add(ObjectPressed);
274280
}
275-
// The following code is only reachable when a user RightTapped an unselected row
276-
dataGrid.SelectedItems.Clear();
277-
dataGrid.SelectedItems.Add(ObjectPressed);
281+
278282
}
279283

280284
public static void FindChildren<T>(List<T> results, DependencyObject startNode) where T : DependencyObject

0 commit comments

Comments
 (0)