Show toolbar grips (#9586)

gitextensions · Sep 23, 2021 · 6f9bf27 · 6f9bf27
1 parent 18c9f86
commit 6f9bf27
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/GitUI/CommandsDialogs/FormBrowse.Designer.cs b/GitUI/CommandsDialogs/FormBrowse.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -1163,9 +1163,11 @@ void LoadUserMenu()
 
                 if (scripts.Count == 0)
                 {
+                    ToolStripScripts.GripStyle = ToolStripGripStyle.Hidden;
                     return;
                 }
 
+                ToolStripScripts.GripStyle = ToolStripGripStyle.Visible;
                 foreach (var script in scripts)
                 {
                     ToolStripButton button = new()

diff --git a/GitUI/UserControls/FilterToolBar.Designer.cs b/GitUI/UserControls/FilterToolBar.Designer.cs
diff --git a/GitUI/UserControls/ToolStripEx.cs b/GitUI/UserControls/ToolStripEx.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Reflection;
 using System.Windows.Forms;
 
 namespace GitUI
@@ -9,6 +10,16 @@ namespace GitUI
     /// </summary>
     public class ToolStripEx : ToolStrip, IToolStripEx
     {
+        private readonly ToolStripButton _gripButton;
+
+        public ToolStripEx()
+        {
+            this.UseCustomRenderer();
+
+            PropertyInfo propGrip = GetType().GetProperty("Grip", BindingFlags.Instance | BindingFlags.NonPublic);
+            _gripButton = propGrip.GetValue(this) as ToolStripButton;
+        }
+
         /// <summary>
         /// Gets or sets whether the ToolStripEx honors item clicks when its containing form does
         /// not have input focus.
@@ -25,9 +36,15 @@ public class ToolStripEx : ToolStrip, IToolStripEx
         [DefaultValue(true)]
         public bool DrawBorder { get; set; } = true;
 
-        public ToolStripEx()
+        /// <summary>
+        ///  Gets or sets whether the ToolStrip grip button is enabled.
+        /// </summary>
+        [Category("Appearance")]
+        [DefaultValue(true)]
+        public bool GripEnabled
         {
-            this.UseCustomRenderer();
+            get => _gripButton.Enabled;
+            set => _gripButton.Enabled = value;
         }
 
         protected override void WndProc(ref Message m)