[Ide] Fix Bug 2164 - Context menu submenu shows offscreen

The submenus were lazy-loading during realization, but 
they needed to lazy-load before size request.

1 files changed, 21 insertions, 5 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
index 644c35d095..dacd57d56a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandMenu.cs
@@ -71,6 +71,19 @@ namespace MonoDevelop.Components.Commands
 			}
 		}
 		
+		bool populated;
+		void EnsurePopulated ()
+		{
+			if (populated)
+				return;
+			populated = true;
+			if (commandEntrySet != null) {
+				manager.CreateMenu (commandEntrySet, this);
+				Update ();
+				commandEntrySet = null;
+			}
+		}
+		
 		protected CommandMenu (IntPtr ptr): base (ptr)
 		{
 		}
@@ -81,14 +94,17 @@ namespace MonoDevelop.Components.Commands
 			manager.RegisterUserInteraction ();
 			Update ();
 		}
+		
 		protected override void OnRealized ()
 		{
 			base.OnRealized ();
-			if (commandEntrySet != null) {
-				manager.CreateMenu (commandEntrySet, this);
-				Update ();
-				commandEntrySet = null;
-			}
+			EnsurePopulated ();
+		}
+		
+		protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+		{
+			EnsurePopulated ();
+			base.OnSizeRequested (ref requisition);
 		}
 
 		internal void Update ()