Skip to content

Commit eca37e8

Browse files
committed
fix: crash when drag & drop on macOS
1 parent f586979 commit eca37e8

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/Views/InteractiveRebase.axaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ private void OnRowHeaderPointerPressed(object sender, PointerPressedEventArgs e)
4343
private void OnRowHeaderDragOver(object sender, DragEventArgs e)
4444
{
4545
if (DataContext is ViewModels.InteractiveRebase vm &&
46+
e.Data.Contains("InteractiveRebaseItem") &&
4647
e.Data.Get("InteractiveRebaseItem") is ViewModels.InteractiveRebaseItem src &&
4748
sender is Border { DataContext: ViewModels.InteractiveRebaseItem dst } border &&
4849
src != dst)

src/Views/LauncherTabBar.axaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ private void OnPointerMovedOverTab(object sender, PointerEventArgs e)
216216

217217
private void DropTab(object sender, DragEventArgs e)
218218
{
219-
if (e.Data.Get("MovedTab") is ViewModels.LauncherPage moved &&
219+
if (e.Data.Contains("MovedTab") &&
220+
e.Data.Get("MovedTab") is ViewModels.LauncherPage moved &&
220221
sender is Border { DataContext: ViewModels.LauncherPage to } &&
221222
to != moved)
222223
{

src/Views/Welcome.axaml.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void SetupTreeNodeDragAndDrop(object sender, RoutedEventArgs _)
7373
}
7474
}
7575

76-
private void OnTreeViewKeyDown(object sender, KeyEventArgs e)
76+
private void OnTreeViewKeyDown(object _, KeyEventArgs e)
7777
{
7878
if (TreeContainer.SelectedItem is ViewModels.RepositoryNode node && e.Key == Key.Enter)
7979
{
@@ -163,7 +163,7 @@ private void DragOverTreeView(object sender, DragEventArgs e)
163163

164164
private void DropOnTreeView(object sender, DragEventArgs e)
165165
{
166-
if (e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
166+
if (e.Data.Contains("MovedRepositoryTreeNode") && e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
167167
{
168168
e.Handled = true;
169169
ViewModels.Welcome.Instance.MoveNode(moved, null);
@@ -224,7 +224,8 @@ private void DropOnTreeNode(object sender, DragEventArgs e)
224224
return;
225225
}
226226

227-
if (e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
227+
if (e.Data.Contains("MovedRepositoryTreeNode") &&
228+
e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
228229
{
229230
e.Handled = true;
230231

0 commit comments

Comments
 (0)