Merge pull request #1314 from Eikelenboom/development

Sanitize the GUI window resizing scripts

Templates/BaseGame/game/tools/VPathEditor/Scripts/GuiScript.tscript

@@ -31,8 +31,9 @@ function EVPathEditor::maxSize(%this, %window)
       
       %fixedWindow = VPathEditorTreeWindow;
       %fluidWindow = VPathEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript

@@ -276,8 +276,9 @@ function ConvexEditorGui::maxSize(%this, %window)
       %this.resizing = false;
       
       %fluidWindow = ConvexEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
 
       %position = Canvas.extent.x - %fluidWindow.extent.x SPC %top;
       %extent = %window.extent.x SPC Canvas.extent.y - %bottom;

Templates/BaseGame/game/tools/datablockEditor/datablockEditor.tscript

@@ -824,8 +824,9 @@ function DatablockEditorGui::maxSize(%this, %window)
       
       %fixedWindow = DatablockEditorTreeWindow;
       %fluidWindow = DatablockEditorInspectorWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/decalEditor/decalEditorGui.tscript

@@ -54,8 +54,9 @@ function DecalEditorGui::maxSize(%this, %window)
       
       %fixedWindow = DecalEditorWindow;
       %fluidWindow = DecalPreviewWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/forestEditor/forestEditorGui.tscript

@@ -56,8 +56,9 @@ function ForestEditorGui::maxSize(%this, %window)
       
       %fixedWindow = ForestEditorPalleteWindow;
       %fluidWindow = ForestEditorPropertiesWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript

@@ -284,8 +284,9 @@ function MaterialEditorGui::maxSize(%this, %window)
       
       %fixedWindow = MaterialEditorPreviewWindow;
       %fluidWindow = MaterialEditorPropertiesWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/meshRoadEditor/meshRoadEditorGui.tscript

@@ -43,8 +43,9 @@ function MeshRoadEditorGui::maxSize(%this, %window)
       
       %fixedWindow = MeshRoadEditorTreeWindow;
       %fluidWindow = MeshRoadEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/missionAreaEditor/missionAreaEditorGui.ed.tscript

@@ -54,8 +54,9 @@ function MissionAreaEditorGui::maxSize(%this, %window)
       
       %fixedWindow = MissionAreaEditorTerrainWindow;
       %fluidWindow = MissionAreaEditorPropertiesWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/navEditor/navEditor.tscript

@@ -69,8 +69,9 @@ function NavEditorGui::maxSize(%this, %window)
       
       %fixedWindow = NavEditorTreeWindow;
       %fluidWindow = NavEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/particleEditor/particleEditor.ed.tscript

@@ -276,8 +276,9 @@ function ParticleEditor::maxSize(%this, %window)
       // prevent onResize after a resize
       %this.resizing = false;
       
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/riverEditor/riverEditorGui.tscript

@@ -60,8 +60,9 @@ function RiverEditorGui::maxSize(%this, %window)
       
       %fixedWindow = RiverEditorTreeWindow;
       %fluidWindow = RiverEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/roadEditor/roadEditorGui.tscript

@@ -73,8 +73,9 @@ function RoadEditorGui::maxSize(%this, %window)
       
       %fixedWindow = RoadEditorTreeWindow;
       %fluidWindow = RoadEditorOptionsWindow;
-      %top = EditorGuiToolbar.extent.y + 6 - 7;
-      %bottom = %top + 65 - 6;
+      %offset = -1; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/worldEditor/scripts/EditorGui.ed.tscript

@@ -1616,8 +1616,9 @@ function EWorldEditor::maxSize(%this, %window)
       
       %fixedWindow = EWTreeWindow;
       %fluidWindow = EWInspectorWindow;
-      %top = EditorGuiToolbar.extent.y + 6 + 19;
-      %bottom = %top + 65 - 6;
+      %offset = 25; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom + 12;
       
       // --- Fixed window (top) ------------------------------------------------

Templates/BaseGame/game/tools/worldEditor/scripts/editors/terrainEditor.ed.tscript

@@ -596,8 +596,9 @@ function TerrainPainterContainer::maxSize(%this, %window)
       
       %fixedWindow = EPainterPreview;
       %fluidWindow = EPainter;
-      %top = EditorGuiToolbar.extent.y + 6 - 7 + 24;
-      %bottom = %top + 65 - 6;
+      %offset = 23; // tweak the vertical offset so that it aligns neatly
+      %top = EditorGuiToolbar.extent.y + %offset;
+      %bottom = %top + 59;
       %maxHeight = Canvas.extent.y - %top - %bottom;
       
       // --- Fixed window (top) ------------------------------------------------