Merge pull request #2259 from cwensley/curtis/mac-grid-contextmenu-without-header

cwensley · web-flow · commit f1aabaa63d20 · 2022-07-19T09:59:55.000-07:00
Mac: Fix crash when setting context menu without header
diff --git a/src/Eto.Mac/Forms/Controls/GridHandler.cs b/src/Eto.Mac/Forms/Controls/GridHandler.cs
@@ -415,7 +415,7 @@ public bool ShowHeader
 			{
 				if (value && Control.HeaderView == null)
 				{
-					Control.HeaderView = headerView = new EtoTableHeaderView { Handler = this };
+					Control.HeaderView = headerView = new EtoTableHeaderView { Handler = this, Menu = ContextMenu.ToNS() };
 				}
 				else if (!value && Control.HeaderView != null)
 				{
@@ -437,7 +437,8 @@ public virtual ContextMenu ContextMenu
 			{
 				Widget.Properties.Set(GridHandler.ContextMenu_Key, value);
 				Control.Menu = value.ToNS();
-				Control.HeaderView.Menu = value.ToNS();
+				if (Control.HeaderView != null)
+					Control.HeaderView.Menu = value.ToNS();
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ public bool ShowHeader`
`415`	`415`	`{`
`416`	`416`	`if (value && Control.HeaderView == null)`
`417`	`417`	`{`
`418`		`- Control.HeaderView = headerView = new EtoTableHeaderView { Handler = this };`
	`418`	`+ Control.HeaderView = headerView = new EtoTableHeaderView { Handler = this, Menu = ContextMenu.ToNS() };`
`419`	`419`	`}`
`420`	`420`	`else if (!value && Control.HeaderView != null)`
`421`	`421`	`{`
`@@ -437,7 +437,8 @@ public virtual ContextMenu ContextMenu`
`437`	`437`	`{`
`438`	`438`	`Widget.Properties.Set(GridHandler.ContextMenu_Key, value);`
`439`	`439`	`Control.Menu = value.ToNS();`
`440`		`- Control.HeaderView.Menu = value.ToNS();`
	`440`	`+ if (Control.HeaderView != null)`
	`441`	`+ Control.HeaderView.Menu = value.ToNS();`
`441`	`442`	`}`
`442`	`443`	`}`
`443`	`444`