Merge pull request #8719 from RussKie/disable_toolbar_movement

gitextensions · Jan 18, 2021 · 9685011 · 9685011
2 parents 37e7501 + 43cf6b5
commit 9685011
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 28 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
@@ -278,6 +278,8 @@ public FormBrowse([NotNull] GitUICommands commands, string filter, ObjectId sele
 
             ManageWorktreeSupport();
 
+            WorkaroundToolbarLocationBug();
+
             var toolBackColor = SystemColors.Window;
             var toolForeColor = SystemColors.WindowText;
             BackColor = toolBackColor;
@@ -318,6 +320,17 @@ public FormBrowse([NotNull] GitUICommands commands, string filter, ObjectId sele
 
             return;
 
+            void WorkaroundToolbarLocationBug()
+            {
+                // Layout engine bug (?) which may change the order of toolbars
+                // if the 1st one becomes longer than the 2nd toolbar's Location.X
+                // the layout engine will be place the 2nd toolbar first
+                toolPanel.TopToolStripPanel.Controls.Clear();
+                toolPanel.TopToolStripPanel.Controls.Add(ToolStripScripts);
+                toolPanel.TopToolStripPanel.Controls.Add(ToolStripFilters);
+                toolPanel.TopToolStripPanel.Controls.Add(ToolStripMain);
+            }
+
             void FocusRevisionDiffFileStatusList()
             {
                 if (!revisionDiff.Visible)
@@ -446,6 +459,9 @@ void InitToolStripStyles(Color toolForeColor, Color toolBackColor)
                 ToolStripMain.ForeColor = toolForeColor;
                 ToolStripFilters.BackColor = toolBackColor;
                 ToolStripFilters.ForeColor = toolForeColor;
+                ToolStripScripts.BackColor = toolBackColor;
+                ToolStripScripts.ForeColor = toolForeColor;
+
                 toolStripRevisionFilterDropDownButton.BackColor = toolBackColor;
                 toolStripRevisionFilterDropDownButton.ForeColor = toolForeColor;
 
@@ -621,18 +637,7 @@ protected override void OnApplicationActivated()
 
         protected override void OnLoad(EventArgs e)
         {
-            // Removing the main menu before restoring the toolstrip layouts
-            // as it *does* randomly change the order of the defined items in the menu
-            Controls.Remove(mainMenuStrip);
-
-            toolPanel.TopToolStripPanel.SuspendLayout();
-            ToolStripManager.LoadSettings(this, "toolsettings");
-            toolPanel.TopToolStripPanel.ResumeLayout();
-
-            // Add the menu back
-            Controls.Add(mainMenuStrip);
-
-            _formBrowseMenus.CreateToolbarsMenus(ToolStripMain, ToolStripFilters);
+            _formBrowseMenus.CreateToolbarsMenus(ToolStripMain, ToolStripFilters, ToolStripScripts);
 
             HideVariableMainMenuItems();
             RefreshSplitViewLayout();
@@ -695,10 +700,6 @@ protected override void OnActivated(EventArgs e)
 
         protected override void OnFormClosing(FormClosingEventArgs e)
         {
-            // Remove the main menu to prevent its state being persisted
-            Controls.Remove(mainMenuStrip);
-
-            ToolStripManager.SaveSettings(this, "toolsettings");
             SaveApplicationSettings();
 
             foreach (var control in this.FindDescendants())
@@ -1119,11 +1120,11 @@ void LoadUserMenu()
                     .Where(script => script.Enabled && script.OnEvent == ScriptEvent.ShowInUserMenuBar)
                     .ToList();
 
-                for (int i = ToolStripMain.Items.Count - 1; i >= 0; i--)
+                for (int i = ToolStripScripts.Items.Count - 1; i >= 0; i--)
                 {
-                    if (ToolStripMain.Items[i].Tag as string == "userscript")
+                    if (ToolStripScripts.Items[i].Tag as string == "userscript")
                     {
-                        ToolStripMain.Items.RemoveAt(i);
+                        ToolStripScripts.Items.RemoveAt(i);
                     }
                 }
 
@@ -1132,8 +1133,6 @@ void LoadUserMenu()
                     return;
                 }
 
-                ToolStripMain.Items.Add(new ToolStripSeparator { Tag = "userscript" });
-
                 foreach (var script in scripts)
                 {
                     var button = new ToolStripButton
@@ -1156,7 +1155,7 @@ void LoadUserMenu()
                     };
 
                     // add to toolstrip
-                    ToolStripMain.Items.Add(button);
+                    ToolStripScripts.Items.Add(button);
                 }
             }
 

diff --git a/GitUI/CommandsDialogs/FormBrowse.resx b/GitUI/CommandsDialogs/FormBrowse.resx
@@ -147,6 +147,9 @@
   <metadata name="ToolStripFilters.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>711, 17</value>
   </metadata>
+  <metadata name="toolStripScripts.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>844, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>82</value>
   </metadata>

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -2132,6 +2132,10 @@ compare with first:</source>
         <source>Standard</source>
         <target />
       </trans-unit>
+      <trans-unit id="ToolStripScripts.Text">
+        <source>Scripts</source>
+        <target />
+      </trans-unit>
       <trans-unit id="TreeTabPage.Text">
         <source>File tree</source>
         <target />