Merge pull request picoe#2563 from cwensley/curtis/mac-fix-gridview-b…

…ackground-on-sonoma Mac: Fix setting background of cells on Sonoma
cwensley · Oct 17, 2023 · 74ef2cf · 74ef2cf
2 parents fdcd583 + f2a29fc
commit 74ef2cf
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs b/src/Eto.Mac/Forms/Cells/CustomCellHandler.cs
@@ -59,7 +59,7 @@ public override void DrawRect(CGRect dirtyRect)
 				if (DrawsBackground && BackgroundColor != null && BackgroundColor.AlphaComponent > 0)
 				{
 					BackgroundColor.Set();
-					NSGraphics.RectFill(dirtyRect);
+					NSGraphics.RectFill(Bounds);
 				}
 				base.DrawRect(dirtyRect);
 			}

diff --git a/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs b/src/Eto.Mac/Forms/Cells/DrawableCellHandler.cs
@@ -156,13 +156,13 @@ public override void DrawRect(CGRect dirtyRect)
 				var nscontext = NSGraphicsContext.CurrentContext;
 				var isFirstResponder = Window?.FirstResponder == this;
 
+				var cellFrame = Bounds;
 				if (DrawsBackground)
 				{
 					var context = nscontext.CGContext;
 					context.SetFillColor(BackgroundColor.ToCG());
-					context.FillRect(dirtyRect);
+					context.FillRect(cellFrame);
 				}
-				var cellFrame = Bounds;
 
 				var handler = Handler;
 				if (handler == null)

diff --git a/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs b/src/Eto.Mac/Forms/Cells/ImageViewCellHandler.cs
@@ -122,7 +122,7 @@ public override void DrawRect(CGRect dirtyRect)
 				if (BackgroundColor != null && BackgroundColor.AlphaComponent > 0)
 				{
 					BackgroundColor.Set();
-					NSGraphics.RectFill(dirtyRect);
+					NSGraphics.RectFill(Bounds);
 				}
 				base.DrawRect(dirtyRect);
 			}

diff --git a/src/Eto.Mac/Forms/Controls/GridViewHandler.cs b/src/Eto.Mac/Forms/Controls/GridViewHandler.cs
@@ -34,7 +34,7 @@ public override void DrawBackground(CGRect clipRect)
 				if (backgroundColor != Colors.Transparent)
 				{
 					backgroundColor.ToNSUI().Set();
-					NSGraphics.RectFill(clipRect);
+					NSGraphics.RectFill(Bounds);
 				}
 				else
 					base.DrawBackground(clipRect);

diff --git a/src/Eto.Mac/Forms/Controls/MacImageTextView.cs b/src/Eto.Mac/Forms/Controls/MacImageTextView.cs
@@ -78,16 +78,16 @@ NSTextField CreateTextFieldInternal()
 
         public override void DrawRect(CGRect dirtyRect)
 		{
+			var bounds = Bounds;
             if (BetterBackgroundColor != null)
             {
                 BetterBackgroundColor.SetFill();
-                NSGraphics.RectFill(dirtyRect);
+                NSGraphics.RectFill(bounds);
             }
 
             if (_image != null)
             {
                 var context = NSGraphicsContext.CurrentContext;
-                var bounds = Bounds;
 
                 var imageRect = new CGRect(0, bounds.Y, _imageSize.Width, _imageSize.Height);
                 imageRect.Y += (bounds.Height - _imageSize.Height) / 2;

diff --git a/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs b/src/Eto.Mac/Forms/Controls/TreeViewHandler.cs
@@ -269,7 +269,7 @@ public override void DrawBackground(CGRect clipRect)
 					if (backgroundColor != Colors.Transparent)
 					{
 						backgroundColor.ToNSUI().Set();
-						NSGraphics.RectFill(clipRect);
+						NSGraphics.RectFill(Bounds);
 						return;
 					}
 				}