From 4e6f379334430a6fa5139a15c3d1d03484a6a1e7 Mon Sep 17 00:00:00 2001 From: SKProCH Date: Mon, 5 Dec 2022 20:50:13 +0300 Subject: [PATCH 1/3] Make all TextElement properties affect TextPresenter's render --- src/Avalonia.Controls/Presenters/TextPresenter.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs index cc1fa6c513..1381160550 100644 --- a/src/Avalonia.Controls/Presenters/TextPresenter.cs +++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs @@ -110,7 +110,8 @@ namespace Avalonia.Controls.Presenters static TextPresenter() { - AffectsRender(CaretBrushProperty, SelectionBrushProperty); + AffectsRender(CaretBrushProperty, SelectionBrushProperty, + TextElement.FontFamilyProperty, TextElement.FontSizeProperty, TextElement.FontStyleProperty, TextElement.FontWeightProperty, TextElement.FontStretchProperty, TextElement.ForegroundProperty); } public TextPresenter() From 3b8a2a9be2153a4c9660f17f1c53c450ebe15b89 Mon Sep 17 00:00:00 2001 From: SKProCH Date: Tue, 6 Dec 2022 12:14:49 +0300 Subject: [PATCH 2/3] Reformat AffectRender's parameters --- src/Avalonia.Controls/Presenters/TextPresenter.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs index 1381160550..683b8f1768 100644 --- a/src/Avalonia.Controls/Presenters/TextPresenter.cs +++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs @@ -110,8 +110,15 @@ namespace Avalonia.Controls.Presenters static TextPresenter() { - AffectsRender(CaretBrushProperty, SelectionBrushProperty, - TextElement.FontFamilyProperty, TextElement.FontSizeProperty, TextElement.FontStyleProperty, TextElement.FontWeightProperty, TextElement.FontStretchProperty, TextElement.ForegroundProperty); + AffectsRender( + CaretBrushProperty, + SelectionBrushProperty, + TextElement.FontFamilyProperty, + TextElement.FontSizeProperty, + TextElement.FontStyleProperty, + TextElement.FontWeightProperty, + TextElement.FontStretchProperty, + TextElement.ForegroundProperty); } public TextPresenter() From 0320fc703350195ecadb0229b95bc438b1833115 Mon Sep 17 00:00:00 2001 From: SKProCH Date: Tue, 6 Dec 2022 21:34:25 +0300 Subject: [PATCH 3/3] Remove unnecessary TextElement properties from TextPresenter's AffectRender --- src/Avalonia.Controls/Presenters/TextPresenter.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs index 683b8f1768..7eaff49910 100644 --- a/src/Avalonia.Controls/Presenters/TextPresenter.cs +++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs @@ -110,15 +110,7 @@ namespace Avalonia.Controls.Presenters static TextPresenter() { - AffectsRender( - CaretBrushProperty, - SelectionBrushProperty, - TextElement.FontFamilyProperty, - TextElement.FontSizeProperty, - TextElement.FontStyleProperty, - TextElement.FontWeightProperty, - TextElement.FontStretchProperty, - TextElement.ForegroundProperty); + AffectsRender(CaretBrushProperty, SelectionBrushProperty, TextElement.ForegroundProperty); } public TextPresenter()