From 61e106251d424296e3161ce88d39c21c870ea97c Mon Sep 17 00:00:00 2001
From: Daniel Buckmaster <dan.buckmaster@gmail.com>
Date: Mon, 15 Dec 2014 11:22:44 +1100
Subject: [PATCH] Made toolbar resize intelligently.

---
 Templates/Empty/game/tools/worldEditor/gui/ToolsToolbar.ed.gui | 2 +-
 Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs | 1 +
 Templates/Full/game/tools/worldEditor/gui/ToolsToolbar.ed.gui  | 2 +-
 Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs  | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Templates/Empty/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/Empty/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
index 53c9a289f..f57c39be7 100644
--- a/Templates/Empty/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
+++ b/Templates/Empty/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
@@ -8,7 +8,7 @@
    HorizSizing = "right";
    VertSizing = "bottom";
    Position = "0 31";
-   Extent = (29 + 4) * 14 + 12 SPC "33";
+   Extent = "0 33";
    MinExtent = "8 2";
    canSave = "1";
    Visible = "1";
diff --git a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs
index fdfd296fe..2b267a0b0 100644
--- a/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs
+++ b/Templates/Empty/game/tools/worldEditor/scripts/EditorGui.ed.cs
@@ -384,6 +384,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %bitma
          useMouseEvents = "0";
       };
       ToolsToolbarArray.add(%button);
+      EWToolsToolbar.setExtent((25 + 8) * (%count + 1) + 12 SPC "33");
    }
 }
 
diff --git a/Templates/Full/game/tools/worldEditor/gui/ToolsToolbar.ed.gui b/Templates/Full/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
index 53c9a289f..f57c39be7 100644
--- a/Templates/Full/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
+++ b/Templates/Full/game/tools/worldEditor/gui/ToolsToolbar.ed.gui
@@ -8,7 +8,7 @@
    HorizSizing = "right";
    VertSizing = "bottom";
    Position = "0 31";
-   Extent = (29 + 4) * 14 + 12 SPC "33";
+   Extent = "0 33";
    MinExtent = "8 2";
    canSave = "1";
    Visible = "1";
diff --git a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs
index fdfd296fe..2b267a0b0 100644
--- a/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs
+++ b/Templates/Full/game/tools/worldEditor/scripts/EditorGui.ed.cs
@@ -384,6 +384,7 @@ function EditorGui::addToToolsToolbar( %this, %pluginName, %internalName, %bitma
          useMouseEvents = "0";
       };
       ToolsToolbarArray.add(%button);
+      EWToolsToolbar.setExtent((25 + 8) * (%count + 1) + 12 SPC "33");
    }
 }