Skip to content

Commit c7db4d8

Browse files
committed
Update XNAUI
1 parent 46e5adb commit c7db4d8

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/TSMapEditor/Config/Default/EditorThemes.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ DisabledItemColor=128,128,128
2424
ButtonHoverColor=255,255,255
2525
BackgroundColor=0,0,0
2626
FocusColor=64,64,64
27+
SelectionColor=128,128,128
2728
PanelBackgroundColor=0,0,0,128
2829
PanelBorderColor=128,128,128
2930
DefaultAlphaRate=0.005
@@ -49,6 +50,7 @@ DisabledItemColor=128,128,128
4950
ButtonHoverColor=255,255,255
5051
BackgroundColor=0,0,0
5152
FocusColor=0,96,0
53+
SelectionColor=0,128,0
5254
PanelBackgroundColor=0,0,0,128
5355
PanelBorderColor=0,164,0
5456
DefaultAlphaRate=0.005
@@ -74,6 +76,7 @@ DisabledItemColor=128,128,128
7476
ButtonHoverColor=255,255,255
7577
BackgroundColor=0,0,0
7678
FocusColor=128,0,0
79+
SelectionColor=168,0,0
7780
PanelBackgroundColor=0,0,0,128
7881
PanelBorderColor=128,0,0
7982
DefaultAlphaRate=0.005
@@ -99,6 +102,7 @@ DisabledItemColor=128,128,128
99102
ButtonHoverColor=255,255,0
100103
BackgroundColor=0,0,0
101104
FocusColor=96,96,0
105+
SelectionColor=128,128,0
102106
PanelBackgroundColor=48,32,0,128
103107
PanelBorderColor=128,128,0
104108
DefaultAlphaRate=0.005

src/TSMapEditor/TSMapEditor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.3" />
522522
<PackageReference Include="Rampastring.Tools" Version="2.0.6" />
523523
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.3" />
524-
<PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="2.6.4" />
524+
<PackageReference Include="Rampastring.XNAUI.WindowsDX" Version="2.7.1" />
525525
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
526526
<PackageReference Include="Westwind.Scripting" Version="1.3.3" />
527527
</ItemGroup>

src/TSMapEditor/UI/Controls/EditorWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public override void Update(GameTime gameTime)
150150

151151
// Only allow moving window if the active child is not a control that is used by dragging
152152
// TODO this could be made more object-oriented with a property at XNAControl level
153-
if (activeChild == null || !(activeChild is XNAPanel || activeChild is XNAScrollBar || activeChild is XNATrackbar))
153+
if (activeChild == null || !(activeChild is XNAPanel || activeChild.HandlesDragging))
154154
{
155155
InteractedWith?.Invoke(this, EventArgs.Empty);
156156
IsDragged = true;

0 commit comments

Comments
 (0)