Build fixes

rds1983 · Nov 8, 2023 · 45ee8b0 · 45ee8b0
1 parent a16bfb6
commit 45ee8b0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs b/samples/Myra.Samples.Silk.NET/AllWidgets.Generated.cs
@@ -127,6 +127,7 @@ private void BuildUI()
 			_buttonOpenFile = new ImageTextButton();
 			_buttonOpenFile.Text = "Open File";
 			_buttonOpenFile.Padding = new Thickness(8, 0);
+			_buttonOpenFile.Tooltip = "Tooltip 1";
 			Grid.SetColumn(_buttonOpenFile, 1);
 			Grid.SetRow(_buttonOpenFile, 1);
 			_buttonOpenFile.Id = "_buttonOpenFile";

diff --git a/src/Myra/Graphics2D/UI/Desktop.cs b/src/Myra/Graphics2D/UI/Desktop.cs
@@ -427,7 +427,7 @@ public void ShowContextMenu(Widget menu, Point position) =>
 			ShowOverWidget(menu, OverWidgetType.ContextMenu, position);
 
 
-		public void ShowTooltip(Widget widget, string text, Point position)
+		public void ShowTooltip(Widget widget, Point position)
 		{
 			if (string.IsNullOrEmpty(widget.Tooltip))
 			{

diff --git a/src/Myra/Graphics2D/UI/Widget.cs b/src/Myra/Graphics2D/UI/Widget.cs
@@ -860,10 +860,12 @@ public void Render(RenderContext context)
 				(Desktop.OverWidget == null || Desktop.OverWidget.Tag != this) && 
 				_lastMouseMovement != null && (DateTime.Now - _lastMouseMovement.Value).TotalMilliseconds > MyraEnvironment.TooltipDelayInMs)
 			{
-				Desktop.ShowTooltip(this, Tooltip, Desktop.MousePosition + MyraEnvironment.TooltipOffset);
+				var pos = Desktop.MousePosition;
+				pos.X += MyraEnvironment.TooltipOffset.X;
+				pos.Y += MyraEnvironment.TooltipOffset.Y;
+				Desktop.ShowTooltip(this, pos);
 			}
 
-
 			UpdateArrange();
 
 			var oldTransform = context.Transform;

diff --git a/src/Myra/Myra.PlatformAgnostic.csproj b/src/Myra/Myra.PlatformAgnostic.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);PLATFORM_AGNOSTIC</DefineConstants>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <AssemblyName>Myra.PlatformAgnostic</AssemblyName>
+    <AssemblyName>Myra</AssemblyName>
     <PackageId>Myra.PlatformAgnostic</PackageId>
     <OutputPath>bin\PlatformAgnostic\$(Configuration)</OutputPath>
   </PropertyGroup>

diff --git a/src/Myra/Myra.Stride.csproj b/src/Myra/Myra.Stride.csproj
@@ -3,7 +3,7 @@
     <DefineConstants>$(DefineConstants);STRIDE</DefineConstants>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>Myra.Stride</PackageId>
-    <AssemblyName>Myra.Stride</AssemblyName>
+    <AssemblyName>Myra</AssemblyName>
     <OutputPath>bin\Stride\$(Configuration)</OutputPath>
   </PropertyGroup>
 

diff --git a/src/Myra/MyraEnvironment.cs b/src/Myra/MyraEnvironment.cs
@@ -18,8 +18,10 @@
 #elif STRIDE
 using Stride.Engine;
 using Stride.Graphics;
+using Stride.Core.Mathematics;
 #else
 using Myra.Platform;
+using System.Drawing;
 #endif
 
 namespace Myra