From 0416b234b74469f9cde05ae478b16a9a11bca41c Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Thu, 1 Oct 2020 12:52:50 +0300
Subject: [PATCH 1/2] fix #4786 invalidatevisual when foreground changes in
 TextPresenter

---
 src/Avalonia.Controls/Presenters/TextPresenter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index f5115a2f7c..8efbe1719e 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -77,7 +77,7 @@ namespace Avalonia.Controls.Presenters
 
         static TextPresenter()
         {
-            AffectsRender<TextPresenter>(SelectionBrushProperty);
+            AffectsRender<TextPresenter>(SelectionBrushProperty, TextBlock.ForegroundProperty);
             AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordProperty, 
                 TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
                 TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);

From 06fc7dbc6c21fd0530061ab56e40108ab7261fa3 Mon Sep 17 00:00:00 2001
From: Andrey Kunchev <donandren@gmail.com>
Date: Fri, 2 Oct 2020 10:48:50 +0300
Subject: [PATCH 2/2] add SelectionForegroundBrush, CaretBrush as
 AffectRenderer to TextPresenter

---
 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 8efbe1719e..6a6d37605d 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -77,7 +77,8 @@ namespace Avalonia.Controls.Presenters
 
         static TextPresenter()
         {
-            AffectsRender<TextPresenter>(SelectionBrushProperty, TextBlock.ForegroundProperty);
+            AffectsRender<TextPresenter>(SelectionBrushProperty, TextBlock.ForegroundProperty, 
+                                         SelectionForegroundBrushProperty, CaretBrushProperty);
             AffectsMeasure<TextPresenter>(TextProperty, PasswordCharProperty, RevealPasswordProperty, 
                 TextAlignmentProperty, TextWrappingProperty, TextBlock.FontSizeProperty,
                 TextBlock.FontStyleProperty, TextBlock.FontWeightProperty, TextBlock.FontFamilyProperty);