Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/ViewModels/Welcome.cs
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,25 @@ public void AddRootNode()
activePage.Popup = new CreateGroup(null);
}

public RepositoryNode FindParentGroup(RepositoryNode node, RepositoryNode group = null)
{
var collection = (group == null) ? Preferences.Instance.RepositoryNodes : group.SubNodes;
if (collection.Contains(node))
return group;

foreach (var item in collection)
{
if (!item.IsRepository)
{
var parent = FindParentGroup(node, item);
if (parent != null)
return parent;
}
}

return null;
}

public void MoveNode(RepositoryNode from, RepositoryNode to)
{
Preferences.Instance.MoveNode(from, to, true);
Expand Down
7 changes: 5 additions & 2 deletions src/Views/Welcome.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private void DragOverTreeNode(object sender, DragEventArgs e)
if (to == null)
return;

e.DragEffects = to.IsRepository ? DragDropEffects.None : DragDropEffects.Move;
e.DragEffects = DragDropEffects.Move;
e.Handled = true;
}
}
Expand All @@ -226,12 +226,15 @@ private void DropOnTreeNode(object sender, DragEventArgs e)
return;

var to = grid.DataContext as ViewModels.RepositoryNode;
if (to == null || to.IsRepository)
if (to == null)
{
e.Handled = true;
return;
}

if (to.IsRepository)
to = ViewModels.Welcome.Instance.FindParentGroup(to);

if (e.Data.Contains("MovedRepositoryTreeNode") &&
e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
{
Expand Down
Loading