[Ide] FontService fixes

6 files changed, 8 insertions, 10 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
index 4bc5f46731..3266afe292 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/GenericPreviewVisualizer.cs
@@ -51,7 +51,7 @@ namespace MonoDevelop.Debugger.PreviewVisualizers
 
 			var label = new Gtk.Label ();
 			label.Text = value;
-			var font = label.Style.FontDescription.Copy ();
+			var font = label.Style.FontDescription.Copy (); // TODO: VV: Use FontService
 
 			if (font.SizeIsAbsolute) {
 				font.AbsoluteSize = font.Size - 1;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
index d5790882b4..b928141e25 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewVisualizerWindow.cs
@@ -65,7 +65,7 @@ namespace MonoDevelop.Debugger
 
 			var headerTitle = new Label ();
 			headerTitle.ModifyFg (StateType.Normal, Styles.PreviewVisualizerHeaderTextColor.ToGdkColor ());
-			var font = headerTitle.Style.FontDescription.Copy ();
+			var font = headerTitle.Style.FontDescription.Copy (); // TODO: VV: Use FontService
 			font.Weight = Pango.Weight.Bold;
 			headerTitle.ModifyFont (font);
 			headerTitle.Text = val.TypeName;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
index 1ba0159830..962d1b58fd 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ExceptionCaughtDialog.cs
@@ -409,7 +409,7 @@ namespace MonoDevelop.Debugger
 
 	class StackFrameCellRenderer : CellRenderer
 	{
-		static readonly Pango.FontDescription LineNumberFont = FontService.MonospaceFont.CopyModified (0.9d);
+		static readonly Pango.FontDescription LineNumberFont = FontService.MonospaceFont.CopyModified (Ide.Gui.Styles.FontScale11);
 		const int RoundedRectangleRadius = 2;
 		const int RoundedRectangleHeight = 14;
 		const int RoundedRectangleWidth = 28;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
index c09aa80603..5da2ab92d6 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs
@@ -298,7 +298,7 @@ namespace MonoDevelop.Debugger
 			Selection.Changed += HandleSelectionChanged;
 			ResetColumnSizes ();
 			
-			Pango.FontDescription newFont = Style.FontDescription.Copy ();
+			Pango.FontDescription newFont = Style.FontDescription.Copy (); // TODO: VV: Use FontService
 			newFont.Size = (newFont.Size * 8) / 10;
 
 			liveIcon = ImageService.GetIcon (Stock.Execute, IconSize.Menu);
@@ -727,7 +727,7 @@ namespace MonoDevelop.Debugger
 				compact = value;
 				Pango.FontDescription newFont;
 				if (compact) {
-					newFont = Style.FontDescription.Copy ();
+					newFont = Style.FontDescription.Copy (); // TODO: VV: Use FontService
 					newFont.Size = (newFont.Size * 8) / 10;
 					valueCol.MaxWidth = 800;
 					crpViewer.Image = ImageService.GetIcon (Stock.Edit).WithSize (12,12);
diff --git a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs
index 9c5980ce04..9cf09eb96e 100644
--- a/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs
+++ b/main/src/addins/MonoDevelop.GtkCore/libstetic/editor/IconSelectorItem.cs
@@ -187,7 +187,7 @@ namespace Stetic.Editor
 			bool calcSize = (testx == -1);
 			
 			Pango.Layout layout = new Pango.Layout (this.PangoContext);
-			Pango.FontDescription des = this.Style.FontDescription.Copy();
+			Pango.FontDescription des = this.Style.FontDescription.Copy(); // TODO: VV: Use FontService
 			des.Size = 10 * (int) Pango.Scale.PangoScale;
 			layout.FontDescription = des;
 			layout.SetMarkup (title);
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
index 9ab27759db..3207a5872c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
@@ -370,8 +370,7 @@ namespace MonoDevelop.VersionControl.Views
 			
 			public void OptionsChanged ()
 			{
-				var description = FontService.SansFont.CopyModified (MonoDevelop.Ide.Gui.Styles.FontScale11);
-				layout.FontDescription = description;
+				layout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 				UpdateWidth ();
 			}
 			
@@ -710,8 +709,7 @@ namespace MonoDevelop.VersionControl.Views
 							}
 
 							using (var authorLayout = MonoDevelop.Components.PangoUtil.CreateLayout (this)) {
-								var description = FontService.SansFont.CopyModified (MonoDevelop.Ide.Gui.Styles.FontScale11);
-								authorLayout.FontDescription = description;
+								authorLayout.FontDescription = FontService.SansFont.CopyModified (Ide.Gui.Styles.FontScale11);
 								authorLayout.SetText (ann.Author);
 								authorLayout.GetPixelSize (out authorWidth, out h);