Merge remote-tracking branch 'upstream/master'

Author: JoyfulShush

src/TSMapEditor/Constants.cs

@@ -4,7 +4,7 @@ namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.7.1";
+        public const string ReleaseVersion = "1.7.2";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;

src/TSMapEditor/Rendering/ObjectRenderers/UnitRenderer.cs

@@ -53,16 +53,12 @@ protected override DepthRectangle GetDepthFromPosition(Unit gameObject, Rectangl
             float max = Math.Max(depthTop, depthBottom);
 
             // The unit's body is always drawn first, and at that point cachedDepth is -1f.
-            // For the body, use the depth values computed here, otherwise use the largest depth recorded so far.
-            if (cachedDepth.TopLeft < 0f)
+            // For the shadow and body, use the depth values computed here, otherwise use the largest depth recorded so far.
+            if (cachedDepth.TopLeft < max)
             {
                 cachedDepth = new DepthRectangle(max);
                 return new DepthRectangle(depthTop, depthBottom);
             }
-            else if (cachedDepth.TopLeft < max)
-            {
-                cachedDepth = new DepthRectangle(max);
-            }
 
             return cachedDepth;
         }

src/TSMapEditor/UI/Sidebar/TreeView.cs

@@ -226,12 +226,17 @@ public void FindNode(string text, bool findNext)
                 SelectedNode = foundNode;
 
                 // Scroll the view to the found item
-                int totalHeight = GetTotalContentHeight();
-                if (accumulatedHeight + Height > totalHeight)
-                    accumulatedHeight = totalHeight - Height;
+                int contentHeight = GetTotalContentHeight();
+                if (accumulatedHeight + LineHeight + MARGIN > ViewTop + Height)
+                {
+                    ViewTop += accumulatedHeight + LineHeight + MARGIN - (ViewTop + Height);
+                }
+                else if (accumulatedHeight < ViewTop)
+                {
+                    ViewTop = accumulatedHeight - LineHeight;
+                }
 
                 RefreshScrollbar();
-                ViewTop = accumulatedHeight;
             }
         }
 

src/TSMapEditor/UI/Windows/TaskforcesWindow.cs

@@ -349,7 +349,7 @@ private void ShowTaskForceReferences()
 
                 EditorMessageBox.Show(WindowManager, 
                     Translate(this, "ReferencesFound.Title", "TaskForce References"),
-                    string.Format(Translate(this, "ReferencesFound.Description", "{The selected TaskForce \"{0}\" ({1}) is used by the following TeamTypes:}" + Environment.NewLine + Environment.NewLine + "{2}"),
+                    string.Format(Translate(this, "ReferencesFound.Description", "The selected TaskForce \"{0}\" ({1}) is used by the following TeamTypes:" + Environment.NewLine + Environment.NewLine + "{2}"),
                         editedTaskForce.Name, editedTaskForce.ININame, stringBuilder.ToString()), 
                     MessageBoxButtons.OK);
             }