Skip to content

Commit 7806dbf

Browse files
committed
Fix an edge case where the search bar was not active by default in object selection windows opened from pop-up selector controls
1 parent fd4fc14 commit 7806dbf

4 files changed

Lines changed: 17 additions & 4 deletions

File tree

src/TSMapEditor.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28307.1231
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.13.35806.99 d17.13
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TSMapEditor", "TSMapEditor\TSMapEditor.csproj", "{7F1101DE-6849-404C-9141-0DF6A6BF12E7}"
77
EndProject

src/TSMapEditor/TSMapEditor.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,9 @@
472472
<ItemGroup>
473473
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
474474
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.3" />
475-
<PackageReference Include="Rampastring.Tools" Version="2.0.6" />
475+
<PackageReference Include="Rampastring.Tools" Version="2.0.7" />
476476
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.3" />
477-
<PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="3.0.4" />
477+
<PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="3.0.6" />
478478
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
479479
<PackageReference Include="Westwind.Scripting" Version="1.3.3" />
480480
</ItemGroup>

src/TSMapEditor/UI/Controls/EditorPopUpSelector.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,18 @@ public EditorPopUpSelector(WindowManager windowManager) : base(windowManager)
2626

2727
private Color textColor;
2828

29+
public override void OnLeftClick(InputEventArgs inputEventArgs)
30+
{
31+
inputEventArgs.Handled = true;
32+
base.OnLeftClick(inputEventArgs);
33+
}
34+
35+
public override void OnMouseLeftDown(InputEventArgs e)
36+
{
37+
e.Handled = true;
38+
base.OnMouseLeftDown(e);
39+
}
40+
2941
public override void OnMouseEnter()
3042
{
3143
textColor = TextHoverColor;

src/TSMapEditor/UI/UIManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public UIManager(WindowManager windowManager, Map map, TheaterGraphics theaterGr
4646
this.map = map;
4747
this.theaterGraphics = theaterGraphics;
4848
this.editorGraphics = editorGraphics;
49+
InputPassthrough = true;
4950
}
5051

5152
public event EventHandler RenderResolutionChanged;

0 commit comments

Comments
 (0)