Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Handling branch right click #467

Merged
StanleyGoldman merged 11 commits into from
Nov 29, 2017
Merged

Handling branch right click #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd88b4b
Merge remote-tracking branch 'remotes/origin/branches-view' into enha…
StanleyGoldman Nov 27, 2017
a96c288
Merge branch 'fixes/remote-branches-list-error' into enhancements/bra…
StanleyGoldman Nov 27, 2017
658a4a8
Merge branch 'branches-view' into enhancements/branches-view-right-click
StanleyGoldman Nov 27, 2017
e0aedab
Adding a right click handler to Tree.Render(...)
StanleyGoldman Nov 27, 2017
c2a4989
Creating a context menu for local and remote branch nodes
StanleyGoldman Nov 27, 2017
a22725f
Adding right click handlers for delete/create branch functionality
StanleyGoldman Nov 27, 2017
b112b6a
Adding functionality to checkout a remote branch via right click
StanleyGoldman Nov 27, 2017
a5bc4b2
Preventing double and right click functionality on branch folders
StanleyGoldman Nov 27, 2017
684990d
Merge branch 'enhancements/branches-view-rollup' into enhancements/br…
StanleyGoldman Nov 29, 2017
1ac71e8
Some code cleanup
StanleyGoldman Nov 29, 2017
daa4ef6
Making constants out of context menu items labels
StanleyGoldman Nov 29, 2017
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
194 changes: 131 additions & 63 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ class BranchesView : Subview
private const string DeleteBranchTitle = "Delete Branch?";
private const string DeleteBranchButton = "Delete";
private const string CancelButtonLabel = "Cancel";
private const string DeleteBranchContextMenuLabel = "Delete";
private const string SwitchBranchContextMenuLabel = "Switch";
private const string CheckoutBranchContextMenuLabel = "Checkout";

[NonSerialized] private int listID = -1;
[NonSerialized] private BranchesMode targetMode;
Expand Down Expand Up @@ -163,12 +166,7 @@ private void OnButtonBarGUI()
{
if (GUILayout.Button(DeleteBranchButton, EditorStyles.miniButton, GUILayout.ExpandWidth(false)))
{
var selectedBranchName = treeLocals.SelectedNode.Name;
var dialogMessage = string.Format(DeleteBranchMessageFormatString, selectedBranchName);
if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))
{
GitClient.DeleteBranch(selectedBranchName, true).Start();
}
DeleteLocalBranch(treeLocals.SelectedNode.Name);
}
}
EditorGUI.EndDisabledGroup();
Expand Down Expand Up @@ -282,26 +280,20 @@ private void OnTreeGUI(Rect rect)

var treeHadFocus = treeLocals.SelectedNode != null;

rect = treeLocals.Render(rect, scroll, _ => { }, node =>
{
if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, node.Name), ConfirmSwitchOK,
ConfirmSwitchCancel))
{
GitClient.SwitchBranch(node.Name)
.FinallyInUI((success, e) =>
{
if (success)
{
Redraw();
}
else
{
EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
String.Format(Localization.SwitchBranchFailedDescription, node.Name),
Localization.Ok);
}
}).Start();
}
rect = treeLocals.Render(rect, scroll,
node =>{ },
node => {
if (node.IsFolder)
return;

SwitchBranch(node.Name);
},
node => {
if (node.IsFolder)
return;

var menu = CreateContextMenuForLocalBranchNode(node);
menu.ShowAsContext();
});

if (treeHadFocus && treeLocals.SelectedNode == null)
Expand All @@ -316,45 +308,20 @@ private void OnTreeGUI(Rect rect)

rect.y += Styles.TreePadding;

rect = treeRemotes.Render(rect, scroll, _ => {}, selectedNode =>
{
var indexOfFirstSlash = selectedNode.Name.IndexOf('/');
var originName = selectedNode.Name.Substring(0, indexOfFirstSlash);
var branchName = selectedNode.Name.Substring(indexOfFirstSlash + 1);
rect = treeRemotes.Render(rect, scroll,
node => { },
node => {
if (node.IsFolder)
return;

if (Repository.LocalBranches.Any(localBranch => localBranch.Name == branchName))
{
EditorUtility.DisplayDialog(WarningCheckoutBranchExistsTitle,
String.Format(WarningCheckoutBranchExistsMessage, branchName),
WarningCheckoutBranchExistsOK);
}
else
{
var confirmCheckout = EditorUtility.DisplayDialog(ConfirmCheckoutBranchTitle,
String.Format(ConfirmCheckoutBranchMessage, selectedNode.Name, originName),
ConfirmCheckoutBranchOK,
ConfirmCheckoutBranchCancel);
CheckoutRemoteBranch(node.Name);
},
node => {
if (node.IsFolder)
return;

if (confirmCheckout)
{
GitClient
.CreateBranch(branchName, selectedNode.Name)
.FinallyInUI((success, e) =>
{
if (success)
{
Redraw();
}
else
{
EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
String.Format(Localization.SwitchBranchFailedDescription, selectedNode.Name),
Localization.Ok);
}
})
.Start();
}
}
var menu = CreateContextMenuForRemoteBranchNode(node);
menu.ShowAsContext();
});

if (treeHadFocus && treeRemotes.SelectedNode == null)
Expand All @@ -369,6 +336,107 @@ private void OnTreeGUI(Rect rect)
GUILayout.Space(rect.y - initialRect.y);
}

private GenericMenu CreateContextMenuForLocalBranchNode(TreeNode node)
{
var genericMenu = new GenericMenu();

var deleteGuiContent = new GUIContent(DeleteBranchContextMenuLabel);
var switchGuiContent = new GUIContent(SwitchBranchContextMenuLabel);

if (node.IsActive)
{
genericMenu.AddDisabledItem(deleteGuiContent);
genericMenu.AddDisabledItem(switchGuiContent);
}
else
{
genericMenu.AddItem(deleteGuiContent, false, () => {
DeleteLocalBranch(node.Name);
});

genericMenu.AddItem(switchGuiContent, false, () => {
SwitchBranch(node.Name);
});
}

return genericMenu;
}

private GenericMenu CreateContextMenuForRemoteBranchNode(TreeNode node)
{
var genericMenu = new GenericMenu();

var checkoutGuiContent = new GUIContent(CheckoutBranchContextMenuLabel);

genericMenu.AddItem(checkoutGuiContent, false, () => {
CheckoutRemoteBranch(node.Name);
});

return genericMenu;
}

private void CheckoutRemoteBranch(string branch)
{
var indexOfFirstSlash = branch.IndexOf('/');
var originName = branch.Substring(0, indexOfFirstSlash);
var branchName = branch.Substring(indexOfFirstSlash + 1);

if (Repository.LocalBranches.Any(localBranch => localBranch.Name == branchName))
{
EditorUtility.DisplayDialog(WarningCheckoutBranchExistsTitle,
String.Format(WarningCheckoutBranchExistsMessage, branchName), WarningCheckoutBranchExistsOK);
}
else
{
var confirmCheckout = EditorUtility.DisplayDialog(ConfirmCheckoutBranchTitle,
String.Format(ConfirmCheckoutBranchMessage, branch, originName), ConfirmCheckoutBranchOK,
ConfirmCheckoutBranchCancel);

if (confirmCheckout)
{
GitClient.CreateBranch(branchName, branch).FinallyInUI((success, e) => {
if (success)
{
Redraw();
}
else
{
EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
}
}).Start();
}
}
}

private void SwitchBranch(string branch)
{
if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, branch), ConfirmSwitchOK,
ConfirmSwitchCancel))
{
GitClient.SwitchBranch(branch).FinallyInUI((success, e) => {
if (success)
{
Redraw();
}
else
{
EditorUtility.DisplayDialog(Localization.SwitchBranchTitle,
String.Format(Localization.SwitchBranchFailedDescription, branch), Localization.Ok);
}
}).Start();
}
}

private void DeleteLocalBranch(string branch)
{
var dialogMessage = string.Format(DeleteBranchMessageFormatString, branch);
if (EditorUtility.DisplayDialog(DeleteBranchTitle, dialogMessage, DeleteBranchButton, CancelButtonLabel))
{
GitClient.DeleteBranch(branch, true).Start();
}
}

private int CompareBranches(GitBranch a, GitBranch b)
{
if (a.Name.Equals("master"))
Expand Down
16 changes: 11 additions & 5 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
foldersKeys = Folders.Keys.Cast<string>().ToList();
}

public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
{
Profiler.BeginSample("TreeControl");
bool visible = true;
Expand Down Expand Up @@ -191,7 +191,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
{
if (visible)
{
RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick);
RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick, rightClick);
}
rect.y += ItemHeight + ItemSpacing;
}
Expand Down Expand Up @@ -255,7 +255,7 @@ private int ToggleNodeVisibility(int idx, TreeNode rootNode)
return idx;
}

private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
{
bool selectionChanged = false;
var clickRect = new Rect(0f, rect.y, rect.width, rect.height);
Expand All @@ -265,14 +265,20 @@ private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<Tree
SelectedNode = currentNode;
selectionChanged = true;
var clickCount = Event.current.clickCount;
if (clickCount == 1 && singleClick != null)
var mouseButton = Event.current.button;

if (mouseButton == 0 && clickCount == 1 && singleClick != null)
{
singleClick(currentNode);
}
if (clickCount > 1 && doubleClick != null)
if (mouseButton == 0 && clickCount > 1 && doubleClick != null)
{
doubleClick(currentNode);
}
if (mouseButton == 1 && clickCount == 1 && rightClick != null)
{
rightClick(currentNode);
}
}

// Keyboard navigation if this child is the current selection
Expand Down