* MonoDevelop.Components/TooltipWindow.cs:

* MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs:
* MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs:
  Improved multi monitor support.-

svn path=/trunk/monodevelop/; revision=157487

2 files changed, 8 insertions, 8 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
index f65457341a..69f4d8df2a 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/CompletionListWindow.cs
@@ -286,8 +286,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			if (!force && previousHeight != h && previousWidth != w)
 				return;
 			
-			int myMonitor = Screen.GetMonitorAtPoint (X, Y);
-			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (myMonitor);
+			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtPoint (X, Y));
 			
 			previousHeight = h;
 			previousWidth = w;
@@ -530,8 +529,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				declarationViewHidden = false;
 			}
 			
-			int myMonitor = Screen.GetMonitorAtWindow (GdkWindow);
-			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (myMonitor);
+			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtWindow (GdkWindow));
 		
 			Requisition req = declarationviewwindow.SizeRequest ();
 			int dvwWidth = req.Width;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
index 7c5e3ff887..481ba7e1cc 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindowManager.cs
@@ -203,13 +203,15 @@ namespace MonoDevelop.Ide.CodeCompletion
 				Y = CurrentCodeCompletionContext.TriggerYCoord;
 			}
 			
-			if (X + reqSize.Width > window.Screen.Width)
-				X = window.Screen.Width - reqSize.Width;
+			Gdk.Rectangle geometry = window.Screen.GetMonitorGeometry (window.Screen.GetMonitorAtPoint (X, Y));
+		
+			if (X + reqSize.Width > geometry.Right)
+				X = geometry.Right - reqSize.Width;
 			
-			if (Y < 0)
+			if (Y < geometry.Top)
 				Y = CurrentCodeCompletionContext.TriggerYCoord;
 			
-			if (wasAbove || Y + reqSize.Height > window.Screen.Height) {
+			if (wasAbove || Y + reqSize.Height > geometry.Bottom) {
 				Y = Y - CurrentCodeCompletionContext.TriggerTextHeight - reqSize.Height - 4;
 				wasAbove = true;
 			}