* EventArgs to MyraEventArgs migration

aneteanetes · aneteanetes · commit f32f3fe32479 · 2025-08-28T21:47:38.000+03:00
diff --git a/samples/Myra.Samples.DebugConsole/DebugPanel.cs b/samples/Myra.Samples.DebugConsole/DebugPanel.cs
@@ -14,7 +14,7 @@ public DebugPanel()
 			_buttonHideDebug.Click += _buttonHideDebug_Click;
 		}
 
-		private void _buttonHideDebug_Click(object sender, System.EventArgs e)
+		private void _buttonHideDebug_Click(object sender, MyraEventArgs e)
 		{
 			RemoveFromDesktop();
 
diff --git a/samples/Myra.Samples.DebugConsole/GamePanel.cs b/samples/Myra.Samples.DebugConsole/GamePanel.cs
@@ -36,13 +36,13 @@ private void ShowDebugPanel(bool isModal)
 			Desktop.Widgets.Add(debugPanel);
 		}
 
-		private void _buttonDebugPanel_Click(object sender, System.EventArgs e)
+		private void _buttonDebugPanel_Click(object sender, MyraEventArgs e)
 		{
 			ShowDebugPanel(false);
 
 		}
 
-		private void _buttonModalDebugPanel_Click(object sender, System.EventArgs e)
+		private void _buttonModalDebugPanel_Click(object sender, MyraEventArgs e)
 		{
 			ShowDebugPanel(true);
 		}
diff --git a/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj b/samples/Myra.Samples.DebugConsole/Myra.Samples.DebugConsole.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.DebugConsole/Program.cs b/samples/Myra.Samples.DebugConsole/Program.cs
@@ -1,4 +1,6 @@
-﻿namespace Myra.Samples.DebugConsole
+﻿global using Myra.Events;
+
+namespace Myra.Samples.DebugConsole
 {
 	class Program
 	{
diff --git a/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj b/samples/Myra.Samples.Layout2D/Myra.Samples.Layout2D.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.Layout2D/MyraSamplesLayout2D.cs b/samples/Myra.Samples.Layout2D/MyraSamplesLayout2D.cs
@@ -72,13 +72,13 @@ protected override void LoadContent()
 					Text = "Button"
 				}
 			};
-			btnB.Click += (object sender, EventArgs e) => { Console.WriteLine(btnB.Layout2d.Expresion); Console.ReadKey(); };
+			btnB.Click += (object sender, MyraEventArgs e) => { Console.WriteLine(btnB.Layout2d.Expresion); Console.ReadKey(); };
 
 			btnA.Content = new Label
 			{
 				Text = "Calc"
 			};
-			btnA.Click += (object sender, EventArgs e) => { btnB.Layout2d.Expresion = (_desktop.FindChild("Expression") as TextBox).Text; _desktop.InvalidateLayout(); _desktop.UpdateLayout(); };
+			btnA.Click += (object sender, MyraEventArgs e) => { btnB.Layout2d.Expresion = (_desktop.FindChild("Expression") as TextBox).Text; _desktop.InvalidateLayout(); _desktop.UpdateLayout(); };
 			panel.Widgets.Add(btnA);
 
 			g.Widgets.Add(panel);
diff --git a/samples/Myra.Samples.Layout2D/Program.cs b/samples/Myra.Samples.Layout2D/Program.cs
@@ -1,4 +1,5 @@
-﻿using info.lundin.math;
+﻿global using Myra.Events;
+using info.lundin.math;
 using System;
 
 namespace Myra.Samples.Layout2D
diff --git a/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj b/samples/Myra.Samples.NonModalWindows/Myra.Samples.NonModalWindows.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.NonModalWindows/Program.cs b/samples/Myra.Samples.NonModalWindows/Program.cs
@@ -1,4 +1,6 @@
-﻿namespace Myra.Samples.NonModalWindows
+﻿global using Myra.Events;
+
+namespace Myra.Samples.NonModalWindows
 {
 	class Program
 	{
diff --git a/samples/Myra.Samples.NonModalWindows/UI/MainPanel.cs b/samples/Myra.Samples.NonModalWindows/UI/MainPanel.cs
@@ -40,7 +40,7 @@ public void ShowWindows()
 			_button3.IsPressed = true;
 		}
 
-		private void _button1_PressedChanged(object sender, System.EventArgs e)
+		private void _button1_PressedChanged(object sender, MyraEventArgs e)
 		{
 			if (_button1.IsPressed)
 			{
@@ -52,7 +52,7 @@ private void _button1_PressedChanged(object sender, System.EventArgs e)
 			}
 		}
 
-		private void _button2_PressedChanged(object sender, System.EventArgs e)
+		private void _button2_PressedChanged(object sender, MyraEventArgs e)
 		{
 			if (_button2.IsPressed)
 			{
@@ -64,7 +64,7 @@ private void _button2_PressedChanged(object sender, System.EventArgs e)
 			}
 		}
 
-		private void _button3_PressedChanged(object sender, System.EventArgs e)
+		private void _button3_PressedChanged(object sender, MyraEventArgs e)
 		{
 			if (_button3.IsPressed)
 			{
diff --git a/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj b/samples/Myra.Samples.Notepad/Myra.Samples.Notepad.MonoGame.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>Myra.Samples.Notepad</RootNamespace>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/Myra.Samples.Notepad/NotepadGame.cs b/samples/Myra.Samples.Notepad/NotepadGame.cs
@@ -115,15 +115,15 @@ protected override void LoadContent()
 				{
 					if (_desktop.IsKeyDown(Keys.N))
 					{
-						NewItemOnDown(this, EventArgs.Empty);
+						NewItemOnDown(this, MyraEventArgs.Empty);
 					}
 					else if (_desktop.IsKeyDown(Keys.O))
 					{
-						OpenItemOnDown(this, EventArgs.Empty);
+						OpenItemOnDown(this, MyraEventArgs.Empty);
 					}
 					else if (_desktop.IsKeyDown(Keys.S))
 					{
-						SaveItemOnDown(this, EventArgs.Empty);
+						SaveItemOnDown(this, MyraEventArgs.Empty);
 					}
 					else if (_desktop.IsKeyDown(Keys.Q))
 					{
@@ -134,7 +134,7 @@ protected override void LoadContent()
 		}
 
 
-		private void DebugOptionsOnDown(object sender, EventArgs e)
+		private void DebugOptionsOnDown(object sender, MyraEventArgs e)
 		{
 			var dlg = new DebugOptionsWindow();
 
@@ -161,7 +161,7 @@ private string CalculateTitle()
 			return _filePath + " *";
 		}
 
-		private void TextBoxOnTextChanged(object sender, EventArgs eventArgs)
+		private void TextBoxOnTextChanged(object sender, MyraEventArgs eventArgs)
 		{
 			Dirty = true;
 		}
@@ -209,23 +209,23 @@ private void Save(bool setFileName)
 			}
 		}
 
-		private void AboutItemOnDown(object sender, EventArgs eventArgs)
+		private void AboutItemOnDown(object sender, MyraEventArgs eventArgs)
 		{
 			var messageBox = Dialog.CreateMessageBox("Notepad", "Myra Notepad Sample " + MyraEnvironment.Version);
 			messageBox.ShowModal(_desktop);
 		}
 
-		private void SaveAsItemOnDown(object sender, EventArgs eventArgs)
+		private void SaveAsItemOnDown(object sender, MyraEventArgs eventArgs)
 		{
 			Save(true);
 		}
 
-		private void SaveItemOnDown(object sender, EventArgs eventArgs)
+		private void SaveItemOnDown(object sender, MyraEventArgs eventArgs)
 		{
 			Save(false);
 		}
 
-		private void OpenItemOnDown(object sender, EventArgs eventArgs)
+		private void OpenItemOnDown(object sender, MyraEventArgs eventArgs)
 		{
 			var dlg = new FileDialog(FileDialogMode.OpenFile)
 			{
@@ -258,13 +258,13 @@ private void OpenItemOnDown(object sender, EventArgs eventArgs)
 			dlg.ShowModal(_desktop);
 		}
 
-		private void NewItemOnDown(object sender, EventArgs eventArgs)
+		private void NewItemOnDown(object sender, MyraEventArgs eventArgs)
 		{
 			FilePath = string.Empty;
 			_textField.Text = string.Empty;
 		}
 
-		private void QuitItemOnDown(object sender, EventArgs genericEventArgs)
+		private void QuitItemOnDown(object sender, MyraEventArgs genericEventArgs)
 		{
 			Exit();
 		}
diff --git a/samples/Myra.Samples.Notepad/Program.cs b/samples/Myra.Samples.Notepad/Program.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿global using Myra.Events;
 
 namespace Myra.Samples.Notepad
 {
diff --git a/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj b/samples/Myra.Samples.ObjectEditor/Myra.Samples.ObjectEditor.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.ObjectEditor/ObjectEditorGame.cs b/samples/Myra.Samples.ObjectEditor/ObjectEditorGame.cs
@@ -132,7 +132,7 @@ protected override void LoadContent()
 			_renderContext = new RenderContext();
 		}
 
-		private void ShowButton_PressedChanged(object sender, System.EventArgs e)
+		private void ShowButton_PressedChanged(object sender, MyraEventArgs e)
 		{
 			var button = (ToggleButton)sender;
 			if (button.IsPressed)
diff --git a/samples/Myra.Samples.ObjectEditor/Program.cs b/samples/Myra.Samples.ObjectEditor/Program.cs
@@ -1,4 +1,6 @@
-﻿namespace Myra.Samples.ObjectEditor
+﻿global using Myra.Events;
+
+namespace Myra.Samples.ObjectEditor
 {
 	class Program
 	{
diff --git a/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj b/samples/Myra.Samples.SplitPaneContainer/Myra.Samples.SplitPaneContainer.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <OutputPath>bin\MonoGame\$(Configuration)</OutputPath>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/samples/Myra.Samples.SplitPaneContainer/Program.cs b/samples/Myra.Samples.SplitPaneContainer/Program.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿global using Myra.Events;
 
 namespace Myra.Samples.SplitPaneContainer
 {
diff --git a/samples/Myra.Samples.SplitPaneContainer/SplitPaneGame.cs b/samples/Myra.Samples.SplitPaneContainer/SplitPaneGame.cs
@@ -110,7 +110,7 @@ private void RebuildSplitPane(Orientation orientation)
 			_root.Widgets.Add(_splitPane);
 		}
 
-		private void SplitPaneOnProportionsChanged(object sender, EventArgs eventArgs)
+		private void SplitPaneOnProportionsChanged(object sender, MyraEventArgs eventArgs)
 		{
 			UpdateProportions();
 		}
diff --git a/samples/Myra.Samples.TextRendering/UI/MainPanel.cs b/samples/Myra.Samples.TextRendering/UI/MainPanel.cs
@@ -74,7 +74,7 @@ private void _spinButtonResolutionFactor_ValueChanged(object sender, ValueChange
 			Update();
 		}
 
-		private void _buttonReset_Click(object sender, EventArgs e)
+		private void _buttonReset_Click(object sender, MyraEventArgs e)
 		{
 			_sliderScale.Value = 1.0f;
 			_spinButtonFontSize.Value = 32;
@@ -133,7 +133,7 @@ private FontSystem LoadFontSystem(byte[] data)
 			return result;
 		}
 
-		private void _buttonBrowseFont_Click(object sender, EventArgs e)
+		private void _buttonBrowseFont_Click(object sender, MyraEventArgs e)
 		{
 			var dialog = new FileDialog(FileDialogMode.OpenFile)
 			{
diff --git a/src/Myra/Graphics2D/UI/Widget.cs b/src/Myra/Graphics2D/UI/Widget.cs
@@ -6,7 +6,6 @@
 using Myra.MML;
 using Myra.Graphics2D.UI.Properties;
 using Myra.Attributes;
-using Geranium.Reflection;
 using Myra.Events;
 
 
diff --git a/src/MyraPad/MyraPad.csproj b/src/MyraPad/MyraPad.csproj
@@ -4,7 +4,8 @@
     <TargetFramework>$(AppTargetFramework)</TargetFramework>
     <AssemblyName>MyraPad</AssemblyName>
     <RootNamespace>MyraPad</RootNamespace>
-    <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>	
+    <DefineConstants>$(DefineConstants);MONOGAME</DefineConstants>
+    <LangVersion>10.0</LangVersion>	
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/MyraPad/Program.cs b/src/MyraPad/Program.cs
@@ -1,4 +1,5 @@
-﻿using AssetManagementBase;
+﻿global using Myra.Events;
+using AssetManagementBase;
 using System;
 
 namespace MyraPad
diff --git a/src/MyraPad/UI/ExportOptionsDialog.cs b/src/MyraPad/UI/ExportOptionsDialog.cs
@@ -16,7 +16,7 @@ public ExportOptionsDialog()
 			_buttonChangeOutputPath.Click += ButtonChangeOutputPathOnClick;
 		}
 
-		private void ButtonChangeOutputPathOnClick(object sender, EventArgs eventArgs)
+		private void ButtonChangeOutputPathOnClick(object sender, MyraEventArgs eventArgs)
 		{
 			var dlg = new FileDialog(FileDialogMode.ChooseFolder)
 			{
diff --git a/src/MyraPad/UI/MainForm.cs b/src/MyraPad/UI/MainForm.cs

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public DebugPanel()`
`14`	`14`	`_buttonHideDebug.Click += _buttonHideDebug_Click;`
`15`	`15`	`}`
`16`	`16`
`17`		`- private void _buttonHideDebug_Click(object sender, System.EventArgs e)`
	`17`	`+ private void _buttonHideDebug_Click(object sender, MyraEventArgs e)`
`18`	`18`	`{`
`19`	`19`	`RemoveFromDesktop();`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,13 @@ private void ShowDebugPanel(bool isModal)`
`36`	`36`	`Desktop.Widgets.Add(debugPanel);`
`37`	`37`	`}`
`38`	`38`
`39`		`- private void _buttonDebugPanel_Click(object sender, System.EventArgs e)`
	`39`	`+ private void _buttonDebugPanel_Click(object sender, MyraEventArgs e)`
`40`	`40`	`{`
`41`	`41`	`ShowDebugPanel(false);`
`42`	`42`
`43`	`43`	`}`
`44`	`44`
`45`		`- private void _buttonModalDebugPanel_Click(object sender, System.EventArgs e)`
	`45`	`+ private void _buttonModalDebugPanel_Click(object sender, MyraEventArgs e)`
`46`	`46`	`{`
`47`	`47`	`ShowDebugPanel(true);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace Myra.Samples.DebugConsole`
	`1`	`+global using Myra.Events;`
	`2`	`+`
	`3`	`+namespace Myra.Samples.DebugConsole`
`2`	`4`	`{`
`3`	`5`	`class Program`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,13 @@ protected override void LoadContent()`
`72`	`72`	`Text = "Button"`
`73`	`73`	`}`
`74`	`74`	`};`
`75`		`- btnB.Click += (object sender, EventArgs e) => { Console.WriteLine(btnB.Layout2d.Expresion); Console.ReadKey(); };`
	`75`	`+ btnB.Click += (object sender, MyraEventArgs e) => { Console.WriteLine(btnB.Layout2d.Expresion); Console.ReadKey(); };`
`76`	`76`
`77`	`77`	`btnA.Content = new Label`
`78`	`78`	`{`
`79`	`79`	`Text = "Calc"`
`80`	`80`	`};`
`81`		`- btnA.Click += (object sender, EventArgs e) => { btnB.Layout2d.Expresion = (_desktop.FindChild("Expression") as TextBox).Text; _desktop.InvalidateLayout(); _desktop.UpdateLayout(); };`
	`81`	`+ btnA.Click += (object sender, MyraEventArgs e) => { btnB.Layout2d.Expresion = (_desktop.FindChild("Expression") as TextBox).Text; _desktop.InvalidateLayout(); _desktop.UpdateLayout(); };`
`82`	`82`	`panel.Widgets.Add(btnA);`
`83`	`83`
`84`	`84`	`g.Widgets.Add(panel);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace Myra.Samples.NonModalWindows`
	`1`	`+global using Myra.Events;`
	`2`	`+`
	`3`	`+namespace Myra.Samples.NonModalWindows`
`2`	`4`	`{`
`3`	`5`	`class Program`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void ShowWindows()`
`40`	`40`	`_button3.IsPressed = true;`
`41`	`41`	`}`
`42`	`42`
`43`		`- private void _button1_PressedChanged(object sender, System.EventArgs e)`
	`43`	`+ private void _button1_PressedChanged(object sender, MyraEventArgs e)`
`44`	`44`	`{`
`45`	`45`	`if (_button1.IsPressed)`
`46`	`46`	`{`
`@@ -52,7 +52,7 @@ private void _button1_PressedChanged(object sender, System.EventArgs e)`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- private void _button2_PressedChanged(object sender, System.EventArgs e)`
	`55`	`+ private void _button2_PressedChanged(object sender, MyraEventArgs e)`
`56`	`56`	`{`
`57`	`57`	`if (_button2.IsPressed)`
`58`	`58`	`{`
`@@ -64,7 +64,7 @@ private void _button2_PressedChanged(object sender, System.EventArgs e)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- private void _button3_PressedChanged(object sender, System.EventArgs e)`
	`67`	`+ private void _button3_PressedChanged(object sender, MyraEventArgs e)`
`68`	`68`	`{`
`69`	`69`	`if (_button3.IsPressed)`
`70`	`70`	`{`