Merge remote-tracking branch 'upstream/newFonts'

Conflicts:
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs

2 files changed, 9 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
index 9072f1d35c..14c2042e07 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/ParameterInformationWindow.cs
@@ -78,9 +78,8 @@ namespace MonoDevelop.Ide.CodeCompletion
 
 			headlabel = new MonoDevelop.Components.FixedWidthWrapLabel ();
 			headlabel.Indent = -20;
-			var des = FontService.GetFontDescription ("Editor");
-			
-			headlabel.FontDescription = des;
+
+			headlabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (1.1);
 			
 			headlabel.Wrap = Pango.WrapMode.WordChar;
 			headlabel.BreakOnCamelCasing = false;
@@ -165,6 +164,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			var catLabel = new MonoDevelop.Components.FixedWidthWrapLabel ();
 			catLabel.Text = categoryName;
 			catLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
+			catLabel.FontDescription = FontService.GetFontDescription ("Editor");
 			
 			vbox.PackStart (catLabel, false, true, 0);
 			
@@ -175,6 +175,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			contentLabel.BreakOnPunctuation = true;
 			contentLabel.Markup = categoryContentMarkup.Trim ();
 			contentLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
+			contentLabel.FontDescription = FontService.GetFontDescription ("Editor");
 			
 			vbox.PackStart (contentLabel, true, true, 0);
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
index d67fc56aa3..d9847fb2b9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeCompletion/TooltipInformationWindow.cs
@@ -84,8 +84,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				return;
 
 			using (var layout = new Pango.Layout (PangoContext)) {
-				var des = FontService.GetFontDescription ("Editor");
-				layout.FontDescription = des;
+				layout.FontDescription = FontService.GetFontDescription ("Editor");
 				layout.SetMarkup (tooltipInformation.SignatureMarkup);
 				int w, h;
 				layout.GetPixelSize (out w, out h);
@@ -137,6 +136,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 					contentLabel.MaxWidth = 400;
 					contentLabel.Markup = o.FooterMarkup.Trim ();
 					contentLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
+					contentLabel.FontDescription = FontService.GetFontDescription ("Editor");
 
 					descriptionBox.PackEnd (contentLabel, true, true, 4);
 				}
@@ -201,7 +201,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 				var catLabel = new FixedWidthWrapLabel ();
 				catLabel.Text = categoryName;
 				catLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
-
+				catLabel.FontDescription = FontService.GetFontDescription ("Editor");
 				vbox.PackStart (catLabel, false, true, 0);
 			}
 
@@ -212,6 +212,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			contentLabel.MaxWidth = 400;
 			contentLabel.Markup = categoryContentMarkup.Trim ();
 			contentLabel.ModifyFg (StateType.Normal, foreColor.ToGdkColor ());
+			contentLabel.FontDescription = FontService.GetFontDescription ("Editor");
 
 			vbox.PackStart (contentLabel, true, true, 0);
 
@@ -243,7 +244,7 @@ namespace MonoDevelop.Ide.CodeCompletion
 			
 			headLabel = new FixedWidthWrapLabel ();
 			headLabel.Indent = -20;
-			headLabel.FontDescription = FontService.GetFontDescription ("Editor(TooltipSource)");;
+			headLabel.FontDescription = FontService.GetFontDescription ("Editor").CopyModified (1.1);
 			headLabel.Wrap = Pango.WrapMode.WordChar;
 			headLabel.BreakOnCamelCasing = false;
 			headLabel.BreakOnPunctuation = false;