Merge remote-tracking branch 'upstream/master'

JoyfulShush · JoyfulShush · commit 7814f853148d · 2025-07-17T11:43:22.000+03:00
diff --git a/src/TSMapEditor/Models/TerrainType.cs b/src/TSMapEditor/Models/TerrainType.cs
@@ -5,14 +5,15 @@
 
 namespace TSMapEditor.Models
 {
-    public class TerrainType : GameObjectType
+    public class TerrainType : GameObjectType, IArtConfigContainer
     {
         public TerrainType(string iniName) : base(iniName)
         {
         }
 
         public override RTTIType WhatAmI() => RTTIType.TerrainType;
 
+        public IArtConfig GetArtConfig() => ArtConfig;
         public TerrainArtConfig ArtConfig { get; } = new TerrainArtConfig();
 
         public TerrainOccupation TemperateOccupationBits { get; set; }
diff --git a/src/TSMapEditor/TSMapEditor.csproj b/src/TSMapEditor/TSMapEditor.csproj
@@ -481,7 +481,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="2.7.7" />
+    <PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="3.0.3" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
     <PackageReference Include="Westwind.Scripting" Version="1.3.3" />
   </ItemGroup>
diff --git a/src/TSMapEditor/UI/Controls/EditorLinkLabel.cs b/src/TSMapEditor/UI/Controls/EditorLinkLabel.cs
@@ -26,8 +26,10 @@ protected override void ParseControlINIAttribute(IniFile iniFile, string key, st
             base.ParseControlINIAttribute(iniFile, key, value);
         }
 
-        public override void OnLeftClick()
+        public override void OnLeftClick(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             if (!string.IsNullOrWhiteSpace(URL))
             {
                 try
@@ -44,7 +46,7 @@ public override void OnLeftClick()
                 }
             }
 
-            base.OnLeftClick();
+            base.OnLeftClick(inputEventArgs);
         }
     }
 }
diff --git a/src/TSMapEditor/UI/Controls/EditorWindow.cs b/src/TSMapEditor/UI/Controls/EditorWindow.cs
@@ -27,7 +27,7 @@ public EditorWindow(WindowManager windowManager) : base(windowManager)
         /// to clean up event handlers when the window controller
         /// for a session is cleaned.
         /// </summary>
-        public EventHandler FocusSwitchEventHandler { get; set; }
+        public EventHandler<InputEventArgs> FocusSwitchEventHandler { get; set; }
 
         protected bool CanBeMoved { get; set; } = true;
 
diff --git a/src/TSMapEditor/UI/Controls/MenuButton.cs b/src/TSMapEditor/UI/Controls/MenuButton.cs
@@ -66,9 +66,10 @@ private void ContextMenu_EnabledChanged(object sender, System.EventArgs e)
             }
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            base.OnMouseLeftDown();
+            inputEventArgs.Handled = true;
+            base.OnMouseLeftDown(inputEventArgs);
 
             if (!ContextMenu.Enabled)
             {
@@ -77,9 +78,10 @@ public override void OnMouseLeftDown()
             }            
         }
 
-        public override void OnLeftClick()
+        public override void OnLeftClick(InputEventArgs inputEventArgs)
         {
-            base.OnLeftClick();
+            inputEventArgs.Handled = true;
+            base.OnLeftClick(inputEventArgs);
 
             if ((!ContextMenu.Enabled && !contextMenuDisabledOnCurrentFrame) || contextMenuOpenedOnClick)
                 OpenContextMenu();
diff --git a/src/TSMapEditor/UI/MapUI.cs b/src/TSMapEditor/UI/MapUI.cs
@@ -347,14 +347,16 @@ private void EditorState_CursorActionChanged(object sender, EventArgs e)
             lastTileUnderCursor = null;
         }
 
-        public override void OnMouseScrolled()
+        public override void OnMouseScrolled(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             if (Cursor.ScrollWheelValue > 0)
                 Camera.ZoomLevel += ZoomStep;
             else
                 Camera.ZoomLevel -= ZoomStep;
 
-            base.OnMouseScrolled();
+            base.OnMouseScrolled(inputEventArgs);
         }
 
         public override void OnMouseOnControl()
@@ -448,9 +450,10 @@ public override void OnMouseEnter()
             base.OnMouseEnter();
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            base.OnMouseLeftDown();
+            inputEventArgs.Handled = true;
+            base.OnMouseLeftDown(inputEventArgs);
             leftPressedDownOnControl = true;
 
             if (CursorAction != null)
@@ -494,8 +497,10 @@ public override void OnMouseMove()
             }
         }
 
-        public override void OnLeftClick()
+        public override void OnLeftClick(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             if (tileUnderCursor != null && CursorAction != null)
             {
                 CursorAction.LeftClick(tileUnderCursor.CoordsToPoint());
@@ -513,7 +518,7 @@ public override void OnLeftClick()
                 }
             }
 
-            base.OnLeftClick();
+            base.OnLeftClick(inputEventArgs);
         }
 
         private void HandleDoubleClick()
@@ -540,16 +545,18 @@ private void HandleDoubleClick()
             }
         }
 
-        public override void OnRightClick()
+        public override void OnRightClick(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             if (CursorAction != null && !isRightClickScrolling)
             {
                 CursorAction = null;
             }
 
             isRightClickScrolling = false;
 
-            base.OnRightClick();
+            base.OnRightClick(inputEventArgs);
         }
 
         private MapTile CalculateBestTileUnderCursor()
diff --git a/src/TSMapEditor/UI/OverlayFrameSelector.cs b/src/TSMapEditor/UI/OverlayFrameSelector.cs
@@ -279,15 +279,17 @@ private void CenterLine(List<OverlayFrameSelectorFrame> line, int lineHeight)
             }
         }
 
-        public override void OnMouseScrolled()
+        public override void OnMouseScrolled(InputEventArgs inputEventArgs)
         {
-            base.OnMouseScrolled();
+            inputEventArgs.Handled = true;
+            base.OnMouseScrolled(inputEventArgs);
             viewY += Cursor.ScrollWheelValue * SCROLL_RATE;
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            base.OnMouseLeftDown();
+            inputEventArgs.Handled = true;
+            base.OnMouseLeftDown(inputEventArgs);
             SelectedArrayIndex = GetFrameIndexUnderCursor();
         }
 
diff --git a/src/TSMapEditor/UI/Sidebar/TreeView.cs b/src/TSMapEditor/UI/Sidebar/TreeView.cs
@@ -303,7 +303,7 @@ private void ScrollBar_Scrolled(object sender, EventArgs e)
         /// <summary>
         /// Handles input from a scroll wheel.
         /// </summary>
-        public override void OnMouseScrolled()
+        public override void OnMouseScrolled(InputEventArgs inputEventArgs)
         {
             if (GetTotalContentHeight() < Height)
             {
@@ -312,6 +312,7 @@ public override void OnMouseScrolled()
             }
 
             ViewTop -= Cursor.ScrollWheelValue * ScrollBar.ScrollStep;
+            inputEventArgs.Handled = true;
 
             if (ViewTop < 0)
             {
@@ -325,7 +326,7 @@ public override void OnMouseScrolled()
                 ScrollToBottom();
             }
 
-            base.OnMouseScrolled();
+            base.OnMouseScrolled(inputEventArgs);
         }
 
         /// <summary>
@@ -345,8 +346,10 @@ public override void OnMouseLeave()
             base.OnMouseLeave();
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
+            inputEventArgs.Handled = true;
+
             var node = GetItemOnCursor(GetCursorPoint());
 
             if (node == null)
@@ -370,7 +373,7 @@ public override void OnMouseLeftDown()
                 SelectedNode = node;
             }
 
-            base.OnMouseLeftDown();
+            base.OnMouseLeftDown(inputEventArgs);
         }
 
         private TreeViewNode GetItemOnCursor(Point mouseLocation)
diff --git a/src/TSMapEditor/UI/TileDisplay.cs b/src/TSMapEditor/UI/TileDisplay.cs
@@ -245,16 +245,21 @@ private void CenterLine(List<TileDisplayTile> line, int lineHeight)
             }
         }
 
-        public override void OnMouseScrolled()
+        public override void OnMouseScrolled(InputEventArgs inputEventArgs)
         {
-            base.OnMouseScrolled();
+            inputEventArgs.Handled = true;
+            base.OnMouseScrolled(inputEventArgs);
             ViewY += Cursor.ScrollWheelValue * SCROLL_RATE;
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            base.OnMouseLeftDown();
             SelectedTile = GetTileUnderCursor()?.TileImageToPlace;
+
+            if (SelectedTile != null)
+                inputEventArgs.Handled = true;
+
+            base.OnMouseLeftDown(inputEventArgs);
         }
 
         private TileDisplayTile GetTileUnderCursor()
diff --git a/src/TSMapEditor/UI/TileSelector.cs b/src/TSMapEditor/UI/TileSelector.cs
@@ -215,20 +215,18 @@ private void PreviousTileSet()
             lbTileSetList.SelectedIndex--;
         }
 
-        public override void OnMouseLeftDown()
+        public override void OnMouseLeftDown(InputEventArgs inputEventArgs)
         {
-            if (IsActive)
-            {
-                var cursorPoint = GetCursorPoint();
+            inputEventArgs.Handled = true;
+            var cursorPoint = GetCursorPoint();
 
-                if (!isBeingDragged && cursorPoint.Y > 0 && cursorPoint.Y < ResizeDragThreshold && Cursor.LeftDown)
-                {
-                    isBeingDragged = true;
-                    previousMouseY = GetCursorPoint().Y;
-                }
+            if (!isBeingDragged && cursorPoint.Y > 0 && cursorPoint.Y < ResizeDragThreshold && Cursor.LeftDown)
+            {
+                isBeingDragged = true;
+                previousMouseY = GetCursorPoint().Y;
             }
 
-            base.OnMouseLeftDown();
+            base.OnMouseLeftDown(inputEventArgs);
         }
 
         public override void Update(GameTime gameTime)
@@ -267,7 +265,9 @@ public override void Update(GameTime gameTime)
                 previousMouseY = GetCursorPoint().Y;
 
                 if (!Cursor.LeftDown)
+                {
                     isBeingDragged = false;
+                }
             }
         }
 
diff --git a/src/TSMapEditor/UI/Windows/MegamapWindow.cs b/src/TSMapEditor/UI/Windows/MegamapWindow.cs
@@ -232,7 +232,7 @@ public override void Update(GameTime gameTime)
                 WindowManager.RemoveControl(this);
             }
 
-            if (!IsChildActive)
+            if (GetActiveChild() == null)
             {
                 if (IsActive && Cursor.LeftDown)
                 {
diff --git a/src/TSMapEditor/UI/Windows/TriggersWindow.cs b/src/TSMapEditor/UI/Windows/TriggersWindow.cs
@@ -322,7 +322,7 @@ public override void Initialize()
             AddChild(eventContextMenu);
 
             lbEvents.AllowRightClickUnselect = false;
-            lbEvents.RightClick += (s, e) => { if (editedTrigger != null) { lbEvents.OnMouseLeftDown(); eventContextMenu.Open(GetCursorPoint()); } };
+            lbEvents.RightClick += (s, e) => { if (editedTrigger != null) { lbEvents.OnMouseLeftDown(new InputEventArgs()); eventContextMenu.Open(GetCursorPoint()); } };
 
             actionContextMenu = new EditorContextMenu(WindowManager);
             actionContextMenu.Name = nameof(actionContextMenu);
@@ -334,7 +334,7 @@ public override void Initialize()
             AddChild(actionContextMenu);
 
             lbActions.AllowRightClickUnselect = false;
-            lbActions.RightClick += (s, e) => { if (editedTrigger != null) { lbActions.OnMouseLeftDown(); actionContextMenu.Open(GetCursorPoint()); } };
+            lbActions.RightClick += (s, e) => { if (editedTrigger != null) { lbActions.OnMouseLeftDown(new InputEventArgs()); actionContextMenu.Open(GetCursorPoint()); } };
 
             var sortContextMenu = new EditorContextMenu(WindowManager);
             sortContextMenu.Name = nameof(sortContextMenu);
diff --git a/src/TSMapEditor/UI/Windows/WindowController.cs b/src/TSMapEditor/UI/Windows/WindowController.cs
@@ -294,7 +294,7 @@ private void MapSizeWindow_OnResizeMapButtonClicked(object sender, EventArgs e)
 
         private void AddFocusSwitchHandlerToChildrenRecursive(EditorWindow window, XNAControl control)
         {
-            EventHandler eventHandler = (s, e) => Window_HandleFocusSwitch(window, EventArgs.Empty);
+            EventHandler<InputEventArgs> eventHandler = (s, e) => Window_HandleFocusSwitch(window, EventArgs.Empty);
             window.FocusSwitchEventHandler = eventHandler;
 
             foreach (var child in control.Children)
@@ -307,7 +307,7 @@ private void AddFocusSwitchHandlerToChildrenRecursive(EditorWindow window, XNACo
 
         private void RemoveFocusSwitchHandlerFromChildrenRecursive(EditorWindow window, XNAControl control)
         {
-            EventHandler eventHandler = window.FocusSwitchEventHandler;
+            var eventHandler = window.FocusSwitchEventHandler;
 
             foreach (var child in control.Children)
             {

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,15 @@`
`5`	`5`
`6`	`6`	`namespace TSMapEditor.Models`
`7`	`7`	`{`
`8`		`- public class TerrainType : GameObjectType`
	`8`	`+ public class TerrainType : GameObjectType, IArtConfigContainer`
`9`	`9`	`{`
`10`	`10`	`public TerrainType(string iniName) : base(iniName)`
`11`	`11`	`{`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public override RTTIType WhatAmI() => RTTIType.TerrainType;`
`15`	`15`
	`16`	`+ public IArtConfig GetArtConfig() => ArtConfig;`
`16`	`17`	`public TerrainArtConfig ArtConfig { get; } = new TerrainArtConfig();`
`17`	`18`
`18`	`19`	`public TerrainOccupation TemperateOccupationBits { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,10 @@ protected override void ParseControlINIAttribute(IniFile iniFile, string key, st`
`26`	`26`	`base.ParseControlINIAttribute(iniFile, key, value);`
`27`	`27`	`}`
`28`	`28`
`29`		`- public override void OnLeftClick()`
	`29`	`+ public override void OnLeftClick(InputEventArgs inputEventArgs)`
`30`	`30`	`{`
	`31`	`+ inputEventArgs.Handled = true;`
	`32`	`+`
`31`	`33`	`if (!string.IsNullOrWhiteSpace(URL))`
`32`	`34`	`{`
`33`	`35`	`try`
`@@ -44,7 +46,7 @@ public override void OnLeftClick()`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
`47`		`- base.OnLeftClick();`
	`49`	`+ base.OnLeftClick(inputEventArgs);`
`48`	`50`	`}`
`49`	`51`	`}`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,10 @@ private void ContextMenu_EnabledChanged(object sender, System.EventArgs e)`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`- public override void OnMouseLeftDown()`
	`69`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`70`	`70`	`{`
`71`		`- base.OnMouseLeftDown();`
	`71`	`+ inputEventArgs.Handled = true;`
	`72`	`+ base.OnMouseLeftDown(inputEventArgs);`
`72`	`73`
`73`	`74`	`if (!ContextMenu.Enabled)`
`74`	`75`	`{`
`@@ -77,9 +78,10 @@ public override void OnMouseLeftDown()`
`77`	`78`	`}`
`78`	`79`	`}`
`79`	`80`
`80`		`- public override void OnLeftClick()`
	`81`	`+ public override void OnLeftClick(InputEventArgs inputEventArgs)`
`81`	`82`	`{`
`82`		`- base.OnLeftClick();`
	`83`	`+ inputEventArgs.Handled = true;`
	`84`	`+ base.OnLeftClick(inputEventArgs);`
`83`	`85`
`84`	`86`	`if ((!ContextMenu.Enabled && !contextMenuDisabledOnCurrentFrame) \|\| contextMenuOpenedOnClick)`
`85`	`87`	`OpenContextMenu();`
Original file line number	Diff line number	Diff line change
`@@ -347,14 +347,16 @@ private void EditorState_CursorActionChanged(object sender, EventArgs e)`
`347`	`347`	`lastTileUnderCursor = null;`
`348`	`348`	`}`
`349`	`349`
`350`		`- public override void OnMouseScrolled()`
	`350`	`+ public override void OnMouseScrolled(InputEventArgs inputEventArgs)`
`351`	`351`	`{`
	`352`	`+ inputEventArgs.Handled = true;`
	`353`	`+`
`352`	`354`	`if (Cursor.ScrollWheelValue > 0)`
`353`	`355`	`Camera.ZoomLevel += ZoomStep;`
`354`	`356`	`else`
`355`	`357`	`Camera.ZoomLevel -= ZoomStep;`
`356`	`358`
`357`		`- base.OnMouseScrolled();`
	`359`	`+ base.OnMouseScrolled(inputEventArgs);`
`358`	`360`	`}`
`359`	`361`
`360`	`362`	`public override void OnMouseOnControl()`
`@@ -448,9 +450,10 @@ public override void OnMouseEnter()`
`448`	`450`	`base.OnMouseEnter();`
`449`	`451`	`}`
`450`	`452`
`451`		`- public override void OnMouseLeftDown()`
	`453`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`452`	`454`	`{`
`453`		`- base.OnMouseLeftDown();`
	`455`	`+ inputEventArgs.Handled = true;`
	`456`	`+ base.OnMouseLeftDown(inputEventArgs);`
`454`	`457`	`leftPressedDownOnControl = true;`
`455`	`458`
`456`	`459`	`if (CursorAction != null)`
`@@ -494,8 +497,10 @@ public override void OnMouseMove()`
`494`	`497`	`}`
`495`	`498`	`}`
`496`	`499`
`497`		`- public override void OnLeftClick()`
	`500`	`+ public override void OnLeftClick(InputEventArgs inputEventArgs)`
`498`	`501`	`{`
	`502`	`+ inputEventArgs.Handled = true;`
	`503`	`+`
`499`	`504`	`if (tileUnderCursor != null && CursorAction != null)`
`500`	`505`	`{`
`501`	`506`	`CursorAction.LeftClick(tileUnderCursor.CoordsToPoint());`
`@@ -513,7 +518,7 @@ public override void OnLeftClick()`
`513`	`518`	`}`
`514`	`519`	`}`
`515`	`520`
`516`		`- base.OnLeftClick();`
	`521`	`+ base.OnLeftClick(inputEventArgs);`
`517`	`522`	`}`
`518`	`523`
`519`	`524`	`private void HandleDoubleClick()`
`@@ -540,16 +545,18 @@ private void HandleDoubleClick()`
`540`	`545`	`}`
`541`	`546`	`}`
`542`	`547`
`543`		`- public override void OnRightClick()`
	`548`	`+ public override void OnRightClick(InputEventArgs inputEventArgs)`
`544`	`549`	`{`
	`550`	`+ inputEventArgs.Handled = true;`
	`551`	`+`
`545`	`552`	`if (CursorAction != null && !isRightClickScrolling)`
`546`	`553`	`{`
`547`	`554`	`CursorAction = null;`
`548`	`555`	`}`
`549`	`556`
`550`	`557`	`isRightClickScrolling = false;`
`551`	`558`
`552`		`- base.OnRightClick();`
	`559`	`+ base.OnRightClick(inputEventArgs);`
`553`	`560`	`}`
`554`	`561`
`555`	`562`	`private MapTile CalculateBestTileUnderCursor()`
Original file line number	Diff line number	Diff line change
`@@ -279,15 +279,17 @@ private void CenterLine(List<OverlayFrameSelectorFrame> line, int lineHeight)`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`282`		`- public override void OnMouseScrolled()`
	`282`	`+ public override void OnMouseScrolled(InputEventArgs inputEventArgs)`
`283`	`283`	`{`
`284`		`- base.OnMouseScrolled();`
	`284`	`+ inputEventArgs.Handled = true;`
	`285`	`+ base.OnMouseScrolled(inputEventArgs);`
`285`	`286`	`viewY += Cursor.ScrollWheelValue * SCROLL_RATE;`
`286`	`287`	`}`
`287`	`288`
`288`		`- public override void OnMouseLeftDown()`
	`289`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`289`	`290`	`{`
`290`		`- base.OnMouseLeftDown();`
	`291`	`+ inputEventArgs.Handled = true;`
	`292`	`+ base.OnMouseLeftDown(inputEventArgs);`
`291`	`293`	`SelectedArrayIndex = GetFrameIndexUnderCursor();`
`292`	`294`	`}`
`293`	`295`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ private void ScrollBar_Scrolled(object sender, EventArgs e)`
`303`	`303`	`/// <summary>`
`304`	`304`	`/// Handles input from a scroll wheel.`
`305`	`305`	`/// </summary>`
`306`		`- public override void OnMouseScrolled()`
	`306`	`+ public override void OnMouseScrolled(InputEventArgs inputEventArgs)`
`307`	`307`	`{`
`308`	`308`	`if (GetTotalContentHeight() < Height)`
`309`	`309`	`{`
`@@ -312,6 +312,7 @@ public override void OnMouseScrolled()`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`ViewTop -= Cursor.ScrollWheelValue * ScrollBar.ScrollStep;`
	`315`	`+ inputEventArgs.Handled = true;`
`315`	`316`
`316`	`317`	`if (ViewTop < 0)`
`317`	`318`	`{`
`@@ -325,7 +326,7 @@ public override void OnMouseScrolled()`
`325`	`326`	`ScrollToBottom();`
`326`	`327`	`}`
`327`	`328`
`328`		`- base.OnMouseScrolled();`
	`329`	`+ base.OnMouseScrolled(inputEventArgs);`
`329`	`330`	`}`
`330`	`331`
`331`	`332`	`/// <summary>`
`@@ -345,8 +346,10 @@ public override void OnMouseLeave()`
`345`	`346`	`base.OnMouseLeave();`
`346`	`347`	`}`
`347`	`348`
`348`		`- public override void OnMouseLeftDown()`
	`349`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`349`	`350`	`{`
	`351`	`+ inputEventArgs.Handled = true;`
	`352`	`+`
`350`	`353`	`var node = GetItemOnCursor(GetCursorPoint());`
`351`	`354`
`352`	`355`	`if (node == null)`
`@@ -370,7 +373,7 @@ public override void OnMouseLeftDown()`
`370`	`373`	`SelectedNode = node;`
`371`	`374`	`}`
`372`	`375`
`373`		`- base.OnMouseLeftDown();`
	`376`	`+ base.OnMouseLeftDown(inputEventArgs);`
`374`	`377`	`}`
`375`	`378`
`376`	`379`	`private TreeViewNode GetItemOnCursor(Point mouseLocation)`
Original file line number	Diff line number	Diff line change
`@@ -245,16 +245,21 @@ private void CenterLine(List<TileDisplayTile> line, int lineHeight)`
`245`	`245`	`}`
`246`	`246`	`}`
`247`	`247`
`248`		`- public override void OnMouseScrolled()`
	`248`	`+ public override void OnMouseScrolled(InputEventArgs inputEventArgs)`
`249`	`249`	`{`
`250`		`- base.OnMouseScrolled();`
	`250`	`+ inputEventArgs.Handled = true;`
	`251`	`+ base.OnMouseScrolled(inputEventArgs);`
`251`	`252`	`ViewY += Cursor.ScrollWheelValue * SCROLL_RATE;`
`252`	`253`	`}`
`253`	`254`
`254`		`- public override void OnMouseLeftDown()`
	`255`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`255`	`256`	`{`
`256`		`- base.OnMouseLeftDown();`
`257`	`257`	`SelectedTile = GetTileUnderCursor()?.TileImageToPlace;`
	`258`	`+`
	`259`	`+ if (SelectedTile != null)`
	`260`	`+ inputEventArgs.Handled = true;`
	`261`	`+`
	`262`	`+ base.OnMouseLeftDown(inputEventArgs);`
`258`	`263`	`}`
`259`	`264`
`260`	`265`	`private TileDisplayTile GetTileUnderCursor()`
Original file line number	Diff line number	Diff line change
`@@ -215,20 +215,18 @@ private void PreviousTileSet()`
`215`	`215`	`lbTileSetList.SelectedIndex--;`
`216`	`216`	`}`
`217`	`217`
`218`		`- public override void OnMouseLeftDown()`
	`218`	`+ public override void OnMouseLeftDown(InputEventArgs inputEventArgs)`
`219`	`219`	`{`
`220`		`- if (IsActive)`
`221`		`- {`
`222`		`- var cursorPoint = GetCursorPoint();`
	`220`	`+ inputEventArgs.Handled = true;`
	`221`	`+ var cursorPoint = GetCursorPoint();`
`223`	`222`
`224`		`- if (!isBeingDragged && cursorPoint.Y > 0 && cursorPoint.Y < ResizeDragThreshold && Cursor.LeftDown)`
`225`		`- {`
`226`		`- isBeingDragged = true;`
`227`		`- previousMouseY = GetCursorPoint().Y;`
`228`		`- }`
	`223`	`+ if (!isBeingDragged && cursorPoint.Y > 0 && cursorPoint.Y < ResizeDragThreshold && Cursor.LeftDown)`
	`224`	`+ {`
	`225`	`+ isBeingDragged = true;`
	`226`	`+ previousMouseY = GetCursorPoint().Y;`
`229`	`227`	`}`
`230`	`228`
`231`		`- base.OnMouseLeftDown();`
	`229`	`+ base.OnMouseLeftDown(inputEventArgs);`
`232`	`230`	`}`
`233`	`231`
`234`	`232`	`public override void Update(GameTime gameTime)`
`@@ -267,7 +265,9 @@ public override void Update(GameTime gameTime)`
`267`	`265`	`previousMouseY = GetCursorPoint().Y;`
`268`	`266`
`269`	`267`	`if (!Cursor.LeftDown)`
	`268`	`+ {`
`270`	`269`	`isBeingDragged = false;`
	`270`	`+ }`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`