Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mikkrg@microsoft.com>2019-07-30 15:54:39 +0300
committerVsevolod Kukol <sevoku@microsoft.com>2019-10-16 08:51:56 +0300
commitc1d360239e2cc4022ee0fd2f4e106f8eb43ab04c (patch)
tree094e7a1bd64693cbb15901fdfd90c627aa77f10d /main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
parentaf6c3d148951cc27a214b38a52da893a9d8219d2 (diff)
[Ide] Switched IDE font handling to xwt.
Diffstat (limited to 'main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs')
-rw-r--r--main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
index 204bbfdfcf..802522d887 100644
--- a/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
+++ b/main/src/core/Mono.TextEditor.Shared/Mono.TextEditor/TextEditorOptions.cs
@@ -33,6 +33,7 @@ using MonoDevelop.Core;
using MonoDevelop.Ide.Editor;
using MonoDevelop.Ide.Editor.Highlighting;
using MonoDevelop.Ide;
+using MonoDevelop.Ide.Fonts;
namespace Mono.TextEditor
{
@@ -403,8 +404,11 @@ namespace Mono.TextEditor
get {
if (font == null) {
try {
- if (!IdeServices.FontService.TryParsePangoFont (FontName, out font))
+ if (!IdeServices.FontService.TryGetFont (FontName, out var xwtFont)) {
font = Pango.FontDescription.FromString (DEFAULT_FONT);
+ } else {
+ font = xwtFont.ToPangoFont ();
+ }
} catch (Exception e) {
LoggingService.LogError ("Could not load font: " + FontName, e);
}