Fixes #436

rds1983 · Nov 9, 2023 · e50f650 · e50f650
1 parent b0d86cb
commit e50f650
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/samples/Myra.Samples.AllWidgets/AllWidgets.cs b/samples/Myra.Samples.AllWidgets/AllWidgets.cs
@@ -159,7 +159,7 @@ public AllWidgets()
 		public void OpenFile()
 		{
 			var fileDialog = new FileDialog(FileDialogMode.OpenFile);
-			fileDialog.ShowModal(Desktop);
+			fileDialog.ShowModal(Desktop, darkening: true);
 
 			fileDialog.Closed += (s, a) =>
 			{
@@ -175,7 +175,7 @@ public void OpenFile()
 		public void SaveFile()
 		{
 			var fileDialog = new FileDialog(FileDialogMode.SaveFile);
-			fileDialog.ShowModal(Desktop);
+			fileDialog.ShowModal(Desktop, darkening: true);
 
 			fileDialog.Closed += (s, a) =>
 			{

diff --git a/src/Myra/Graphics2D/UI/Desktop.cs b/src/Myra/Graphics2D/UI/Desktop.cs
@@ -497,6 +497,11 @@ public void RenderVisual()
 			{
 				if (widget.Visible)
 				{
+					if (widget.IsDarkening)
+					{
+						_renderContext.FillRectangle(bounds, MyraEnvironment.DarkeningColor);
+					}
+
 					widget.Render(_renderContext);
 				}
 			}

diff --git a/src/Myra/Graphics2D/UI/Misc/Window.cs b/src/Myra/Graphics2D/UI/Misc/Window.cs
@@ -260,15 +260,17 @@ private void InternalShow(Desktop desktop, Point? position = null)
 			}
 		}
 
-		public void Show(Desktop desktop, Point? position = null)
+		public void Show(Desktop desktop, Point? position = null, bool darkening = false)
 		{
 			IsModal = false;
+			IsDarkening = darkening;
 			InternalShow(desktop, position);
 		}
 
-		public void ShowModal(Desktop desktop, Point? position = null)
+		public void ShowModal(Desktop desktop, Point? position = null, bool darkening = false)
 		{
 			IsModal = true;
+			IsDarkening = darkening;
 			InternalShow(desktop, position);
 
 			_previousKeyboardFocus = desktop.FocusedKeyboardWidget;

diff --git a/src/Myra/Graphics2D/UI/Widget.cs b/src/Myra/Graphics2D/UI/Widget.cs
@@ -43,7 +43,6 @@ public partial class Widget : BaseObject, ITransformable
 		private int _zIndex;
 		private HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Left;
 		private VerticalAlignment _verticalAlignment = VerticalAlignment.Top;
-		private bool _isModal = false;
 		private bool _measureDirty = true;
 		private bool _arrangeDirty = true;
 		private Desktop _desktop;
@@ -591,21 +590,11 @@ internal set
 
 		[XmlIgnore]
 		[Browsable(false)]
-		public bool IsModal
-		{
-			get { return _isModal; }
-
-			set
-			{
-				if (_isModal == value)
-				{
-					return;
-				}
+		public bool IsModal { get; set; }
 
-				_isModal = value;
-				InvalidateMeasure();
-			}
-		}
+		[XmlIgnore]
+		[Browsable(false)]
+		public bool IsDarkening { get; set; }
 
 		[Category("Appearance")]
 		[DefaultValue(1.0f)]

diff --git a/src/Myra/MyraEnvironment.cs b/src/Myra/MyraEnvironment.cs
@@ -252,6 +252,7 @@ public static AssetManager DefaultAssetManager
 		/// Makes the text rendering more smooth(especially when scaling) for the cost of sacrificing some performance 
 		/// </summary>
 		public static bool SmoothText { get; set; }
+		public static Color DarkeningColor { get; set; } = new Color(0, 0, 0, 192);
 
 		private static void GameOnDisposed(object sender, EventArgs eventArgs)
 		{