SidePanel: Disallow copy context for not visible stashes (#10829)

Incorrect info was copied. Co-authored-by: Gerhard Olsson <gerhardol@users.noreply.github.com>
gitextensions · Mar 25, 2023 · e9884aa · e9884aa
1 parent 6772ded
commit e9884aa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/GitUI/BranchTreePanel/BaseRevisionNode.cs b/GitUI/BranchTreePanel/BaseRevisionNode.cs
@@ -37,11 +37,6 @@ protected BaseRevisionNode(Tree tree, string fullPath, bool visible)
         /// </summary>
         public string FullPath => ParentPath.Combine(PathSeparator.ToString(), Name)!;
 
-        /// <summary>
-        /// Gets whether the commit that the node represents is currently visible in the revision grid.
-        /// </summary>
-        public bool Visible { get; set; }
-
         /// <summary>
         /// ObjectId for nodes with a revision.
         /// </summary>

diff --git a/GitUI/BranchTreePanel/NodeBase.cs b/GitUI/BranchTreePanel/NodeBase.cs
@@ -21,6 +21,11 @@ internal abstract class NodeBase
         /// </summary>
         protected internal bool IsSelected { get; set; }
 
+        /// <summary>
+        /// Gets whether the commit that the node represents is currently visible in the revision grid.
+        /// </summary>
+        public bool Visible { get; set; }
+
         protected internal void Select(bool select, bool includingDescendants = false)
         {
             IsSelected = select;

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.ContextActions.cs b/GitUI/BranchTreePanel/RepoObjectsTree.ContextActions.cs
@@ -212,7 +212,7 @@ private void contextMenu_Opening(object sender, CancelEventArgs e)
             bool hasSingleSelection = selectedNodes.Length == 1;
             NodeBase? selectedNode = treeMain.SelectedNode?.Tag as NodeBase;
 
-            copyContextMenuItem.Enable(hasSingleSelection && ((selectedNode is BaseBranchLeafNode branch && branch.Visible) || selectedNode is StashNode));
+            copyContextMenuItem.Enable(hasSingleSelection && (selectedNode is BaseBranchLeafNode or StashNode) && selectedNode.Visible);
             filterForSelectedRefsMenuItem.Enable(selectedNodes.OfType<IGitRefActions>().Any()); // enable if selection contains refs
 
             var selectedLocalBranch = selectedNode as LocalBranchNode;