Merge remote-tracking branch 'upstream/master'

Author: JoyfulShush

src/TSMapEditor/Config/MapCode/Add Reveal Map Trigger.ini

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

src/TSMapEditor/Constants.cs

@@ -66,9 +66,6 @@
     <None Update="Config\Default\Events.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Config\MapCode\Add Reveal Map Trigger.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Config\MapCode\Enable Blue Tiberium Spreader Lighting.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -396,6 +393,9 @@
     <None Update="Content\sbDownArrow.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Content\sbDownArrowHovered.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Content\sbMiddle.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -408,6 +408,9 @@
     <None Update="Content\sbUpArrow.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Content\sbUpArrowHovered.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Content\sortbutton.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -481,7 +484,7 @@
     <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.3" />
     <PackageReference Include="Rampastring.Tools" Version="2.0.6" />
     <PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.3" />
-    <PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="3.0.3" />
+    <PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="3.0.4" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
     <PackageReference Include="Westwind.Scripting" Version="1.3.3" />
   </ItemGroup>
@@ -517,6 +520,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Config\Scripts\Add Map Reveal Trigger.cs">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Compile>
+  </ItemGroup>
   <Target Name="RestoreDotnetTools" BeforeTargets="Restore">
     <Message Text="Restoring dotnet tools" Importance="High" />
     <Exec Command="dotnet tool restore" />

src/TSMapEditor/Content/sbDownArrow.png

@@ -12,6 +12,7 @@ public EditorButton(WindowManager windowManager) : base(windowManager)
         {
             FontIndex = Constants.UIBoldFont;
             Height = Constants.UIButtonHeight;
+            AlphaRate = 0.005f; // Override default animation rate in UISettings
         }
 
         public Texture2D ExtraTexture { get; set; }

src/TSMapEditor/Content/sbDownArrowHovered.png

@@ -173,6 +173,7 @@ public CursorAction CursorAction
 
         public override void Initialize()
         {
+            Name = nameof(MapUI);
             base.Initialize();
 
             scrollRate = UserSettings.Instance.ScrollRate;
@@ -547,16 +548,26 @@ public override void OnRightClick(InputEventArgs inputEventArgs)
         {
             inputEventArgs.Handled = true;
 
-            if (CursorAction != null && !isRightClickScrolling)
+            if (isRightClickScrolling)
+            {
+                StopRightClickScrolling();
+            }
+            else if (CursorAction != null)
             {
                 CursorAction = null;
             }
 
-            isRightClickScrolling = false;
+            StopRightClickScrolling();
 
             base.OnRightClick(inputEventArgs);
         }
 
+        private void StopRightClickScrolling()
+        {
+            isRightClickScrolling = false;
+            rightClickScrollInitPos = new Point(-1, -1);
+        }
+
         private MapTile CalculateBestTileUnderCursor()
         {
             Point2D cursorMapPoint = GetCursorMapPoint();
@@ -612,6 +623,10 @@ public override void Update(GameTime gameTime)
                     }
                 }
             }
+            else if (isRightClickScrolling)
+            {
+                StopRightClickScrolling();
+            }
 
             if (leftPressedDownOnControl && !Cursor.LeftDown)
                 leftPressedDownOnControl = false;

src/TSMapEditor/Content/sbUpArrow.png

@@ -21,6 +21,7 @@ public TileInfoDisplay(WindowManager windowManager, Map map, TheaterGraphics the
             this.map = map;
             this.theaterGraphics = theaterGraphics;
             this.editorState = editorState;
+            InputEnabled = false;
         }
 
         private readonly Map map;