[mono/monodevelop] 6586f942: Try to fix 'Bug 15296 - MonoDevelop : `Navigate To` dialog eventually

   Branch: refs/heads/master
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/5c430a9721e5...6586f9422580

   Commit: 6586f9422580c13f55ba310db789c710875dbefc
   Author: Mike Krüger <[email protected]> (mkrueger)
     Date: 2013-10-16 05:07:03 GMT
      URL: https://github.com/mono/monodevelop/commit/6586f9422580c13f55ba310db789c710875dbefc

Try to fix 'Bug 15296 - MonoDevelop : `Navigate To` dialog eventually
freezes Monodevelop '.

Changed paths:
  M main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs

Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchPopupWindow.cs
===================================================================
@@ -214,7 +214,7 @@ public void Update (SearchPopupSearchPattern pattern)
 				var cat = _cat;
 				var token = src.Token;
 				cat.GetResults (pattern, maxItems, token).ContinueWith (t => {
-					if (t.IsCanceled)
+					if (t.IsCanceled)
 						return;
 					if (t.IsFaulted) {
 						LoggingService.LogError ("Error getting search results", t.Exception);
@@ -304,10 +304,11 @@ Gdk.Size GetIdealSize ()
 		protected override void OnSizeRequested (ref Requisition requisition)
 		{
 			base.OnSizeRequested (ref requisition);
-
-			Gdk.Size idealSize = GetIdealSize ();
-			requisition.Width = idealSize.Width;
-			requisition.Height = idealSize.Height;
+			if (!inResize) {
+				Gdk.Size idealSize = GetIdealSize ();
+				requisition.Width = idealSize.Width;
+				requisition.Height = idealSize.Height;
+			}
 		}
 
 		ItemIdentifier GetItemAt (double px, double py)
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches