From eef29b12590691b3faac9c9a03cb1d942fb93034 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 10 Jan 2014 21:57:29 +0100 Subject: [PATCH] add FontSize to global editor options --- .../Project/Src/Completion/EntityCompletionData.cs | 3 ++- .../Project/Src/Completion/TypeCompletionData.cs | 3 ++- .../Scripting/Test/Utils/MockTextEditorOptions.cs | 6 ++++++ .../WixBinding/Test/Utils/MockTextEditorOptions.cs | 6 ++++++ .../XmlEditor/Test/Utils/MockTextEditorOptions.cs | 6 ++++++ src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs | 6 ++++++ src/Main/Base/Project/Editor/IEditorControlService.cs | 6 ++++++ src/Main/Base/Project/Editor/ITextEditor.cs | 5 +++++ 8 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs index 0ce04236b2..6767c1b54b 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/EntityCompletionData.cs @@ -30,7 +30,8 @@ namespace CSharpBinding.Completion { return new FlowDocumentScrollViewer { Document = XmlDocFormatter.CreateTooltip(entity), - VerticalScrollBarVisibility = ScrollBarVisibility.Auto + VerticalScrollBarVisibility = ScrollBarVisibility.Auto, + FontSize = SD.EditorControlService.GlobalOptions.FontSize }; } } diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs index 0097d71aaa..b6b4fc7a98 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Completion/TypeCompletionData.cs @@ -30,7 +30,8 @@ namespace CSharpBinding.Completion { return new FlowDocumentScrollViewer { Document = XmlDocFormatter.CreateTooltip(type), - VerticalScrollBarVisibility = ScrollBarVisibility.Auto + VerticalScrollBarVisibility = ScrollBarVisibility.Auto, + FontSize = SD.EditorControlService.GlobalOptions.FontSize }; } } diff --git a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs index 25ebe17d96..3c71b08347 100644 --- a/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs +++ b/src/AddIns/BackendBindings/Scripting/Test/Utils/MockTextEditorOptions.cs @@ -36,5 +36,11 @@ namespace ICSharpCode.Scripting.Tests.Utils throw new NotImplementedException(); } } + + public double FontSize { + get { + throw new NotImplementedException(); + } + } } } diff --git a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorOptions.cs b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorOptions.cs index e39db855f5..9d540bed37 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorOptions.cs +++ b/src/AddIns/BackendBindings/WixBinding/Test/Utils/MockTextEditorOptions.cs @@ -56,5 +56,11 @@ namespace WixBinding.Tests.Utils throw new NotImplementedException(); } } + + public double FontSize { + get { + throw new NotImplementedException(); + } + } } } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorOptions.cs b/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorOptions.cs index a88969bab1..d8a85490fc 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorOptions.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Test/Utils/MockTextEditorOptions.cs @@ -52,5 +52,11 @@ namespace XmlEditor.Tests.Utils throw new NotImplementedException(); } } + + public double FontSize { + get { + throw new NotImplementedException(); + } + } } } diff --git a/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs b/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs index 9f2c309a38..c3e5fae41d 100644 --- a/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs +++ b/src/Main/Base/Project/Editor/AvalonEditTextEditorAdapter.cs @@ -151,6 +151,12 @@ namespace ICSharpCode.SharpDevelop.Editor return "Consolas"; } } + + public double FontSize { + get { + return 10.0; + } + } } public virtual ICSharpCode.Core.FileName FileName { diff --git a/src/Main/Base/Project/Editor/IEditorControlService.cs b/src/Main/Base/Project/Editor/IEditorControlService.cs index 194403ec8d..88c606ef29 100644 --- a/src/Main/Base/Project/Editor/IEditorControlService.cs +++ b/src/Main/Base/Project/Editor/IEditorControlService.cs @@ -72,6 +72,12 @@ namespace ICSharpCode.SharpDevelop.Editor } } + public double FontSize { + get { + return 10.0; + } + } + public IHighlighter CreateHighlighter(IDocument document) { return null; diff --git a/src/Main/Base/Project/Editor/ITextEditor.cs b/src/Main/Base/Project/Editor/ITextEditor.cs index 4e696e31ef..5edf023749 100644 --- a/src/Main/Base/Project/Editor/ITextEditor.cs +++ b/src/Main/Base/Project/Editor/ITextEditor.cs @@ -158,6 +158,11 @@ namespace ICSharpCode.SharpDevelop.Editor /// Gets the name of the currently used font. /// string FontFamily { get; } + + /// + /// Gets the currently used font size. + /// + double FontSize { get; } } ///