Some fixes

rds1983 · Dec 11, 2024 · 192a15e · 192a15e
1 parent 51b52cb
commit 192a15e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <RootNamespace>Myra</RootNamespace>
     <Description>UI Library for MonoGame, FNA and Stride</Description>
     <VersionPrefix>1.5.8</VersionPrefix>
-    <XNAssetsVersion>0.7.3</XNAssetsVersion>
+    <XNAssetsVersion>0.7.5</XNAssetsVersion>
     <FontStashSharpVersion>1.3.9</FontStashSharpVersion>
     <LangVersion>8.0</LangVersion>
     <InfoLundinMathVersion>1.2.6</InfoLundinMathVersion>

diff --git a/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs b/src/Myra/Graphics2D/UI/Properties/PropertyGrid.cs
@@ -1220,6 +1220,10 @@ private void FillSubGrid(ref int y, IReadOnlyList<Record> records)
 				{
 					valueWidget = CreateFileEditor(record, hasSetter, "*.png|*.jpg|*.bmp|*.gif", name => Settings.AssetManager.LoadTexture2D(MyraEnvironment.GraphicsDevice, name));
 				}
+				else if (propertyType == typeof(TextureCube))
+				{
+					valueWidget = CreateFileEditor(record, hasSetter, "*.dds", name => Settings.AssetManager.LoadTexture2D(MyraEnvironment.GraphicsDevice, name));
+				}
 #endif
 				else
 				{

diff --git a/src/Myra/Graphics2D/UI/Selectors/ListView.cs b/src/Myra/Graphics2D/UI/Selectors/ListView.cs
@@ -288,7 +288,13 @@ public int? SelectedIndex
 					return null;
 				}
 
-				return Widgets.IndexOf(_selectedItem);
+				var result = Widgets.IndexOf(_selectedItem);
+				if (result == -1)
+				{
+					return null;
+				}
+
+				return result;
 			}
 
 			set
-Original file line number
+Diff line change
@@ Expand Up @@
     				{
     					valueWidget = CreateFileEditor(record, hasSetter, "*.png|*.jpg|*.bmp|*.gif", name => Settings.AssetManager.LoadTexture2D(MyraEnvironment.GraphicsDevice, name));
     				}
+    				else if (propertyType == typeof(TextureCube))
+    				{
+    					valueWidget = CreateFileEditor(record, hasSetter, "*.dds", name => Settings.AssetManager.LoadTexture2D(MyraEnvironment.GraphicsDevice, name));
+    				}
     #endif
     				else
     				{
@@ Expand Down @@