[Ide] Context menu component improvements.

Refactored some of the internals of how we compute context menu position
and made it so that we can pass in [x,y] in window coordinates to show a
context menu. Now positioning by the text cursor with Alt-Shift-F10
works.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=21127

1 files changed, 11 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
index fa68cdbd7d..84b2484b64 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtensibleTextEditor.cs
@@ -585,7 +585,15 @@ namespace MonoDevelop.SourceEditor
 			CommandEntrySet cset = IdeApp.CommandService.CreateCommandEntrySet (ctx, menuPath);
 
 			if (Platform.IsMac) {
-				IdeApp.CommandService.ShowContextMenu (this, evt, cset, this);
+				if (evt == null) {
+					int x, y;
+					var pt = LocationToPoint (this.Caret.Location);
+					TranslateCoordinates (Toplevel, pt.X, pt.Y, out x, out y);
+
+					IdeApp.CommandService.ShowContextMenu (this, x, y, cset, this);
+				} else {
+					IdeApp.CommandService.ShowContextMenu (this, evt, cset, this);
+				}
 			} else {
 				Gtk.Menu menu = IdeApp.CommandService.CreateMenu (cset);
 				var imMenu = CreateInputMethodMenuItem (GettextCatalog.GetString ("_Input Methods"));
@@ -599,7 +607,8 @@ namespace MonoDevelop.SourceEditor
 					GtkWorkarounds.ShowContextMenu (menu, this, evt);
 				} else {
 					var pt = LocationToPoint (this.Caret.Location);
-					GtkWorkarounds.ShowContextMenu (menu, this, new Gdk.Rectangle (pt.X, pt.Y, 1, (int)LineHeight));
+
+					GtkWorkarounds.ShowContextMenu (menu, this, (int)pt.X, (int)pt.Y);
 				}
 			}
 		}