From 66e646a8af905433fa332657a60d1f3e9362f2ee Mon Sep 17 00:00:00 2001
From: Nelson Carrillo <ncarrillo@harbortouch.com>
Date: Sat, 19 Sep 2015 13:08:45 -0400
Subject: [PATCH 1/2] Implemented SetForeground for Pango

---
 src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
index 0fe9afd857..0cbfc50097 100644
--- a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
@@ -36,6 +36,7 @@ namespace Perspex.Cairo.Media
             };
 
             Layout.Alignment = textAlignment.ToCairo();
+            Layout.Attributes = new Pango.AttrList();
         }
 
         public Size Constraint
@@ -115,7 +116,19 @@ namespace Perspex.Cairo.Media
 
         public void SetForegroundBrush(Brush brush, int startIndex, int count)
         {
-            // TODO: Implement.
+            var scb = brush as SolidColorBrush;
+            if (scb != null)
+            {
+
+                var color = new Pango.Color();
+                color.Parse(string.Format("#{0}", scb.Color.ToString().Substring(3)));
+
+                var brushAttr = new Pango.AttrForeground(color);
+                brushAttr.StartIndex = (uint)startIndex;
+                brushAttr.EndIndex = (uint)(startIndex + count);
+
+                Layout.Attributes.Insert(brushAttr);
+            }
         }
     }
 }

From 5e2c1653e331e6b63bb961e7e3cbd37c0cc6b47e Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 19 Sep 2015 19:17:30 +0200
Subject: [PATCH 2/2] Ignore failing cairo tests for the moment.

Font scaling is currently broken in cairo. @ncarrillo removed the hacks
that were working around this, but things will be broken until we
upgrade to gtk3 after alpha 2.
---
 .../Controls/BorderTests.cs                   | Bin 23520 -> 25104 bytes
 .../Media/VisualBrushTests.cs                 |  24 ++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/tests/Perspex.RenderTests/Controls/BorderTests.cs b/tests/Perspex.RenderTests/Controls/BorderTests.cs
index 4e912990e7bcd6e38e664a519eecff5650a23bed..0383bb01a60d2968ffe26b82bbe9807ffa9c9184 100644
GIT binary patch
delta 1318
zcmaE`opHhu#tlL8lm9WQO=jbes@Gr$X2@p9WGG-zV6X*ZB?dQ!e1<%R5+J*nA(<hO
zAqOa%$B+)>Co_~X6air>SU!iL5-64g<mUrT0EsDpb%N9-0`-8zl^8S`Vi|ZDxEPdy
zDsq4(rh<72K($~vnV&<P8zh&<kOI_`Hd&FwdUBka!e$*^Db~s7BCIAmu**&UV1I5f
zJ9u-PS_s>qb|8mt+MsseWDZ@G&2?&gtef48G#CeUP?lJE4eFrWEaK=lxE;8|-EPo2
KaI>J_d0qhRdGEyl

delta 96
zcmbPmgz>?4#tlL8lk-HvHs>iMuz?tp^Ar>|ne(wu{ugI8d4uyCu-F|lmCbefPGAL_
c@0dkF7(sSk5XKHyKL|s~*ABv{37NtR04h8rod5s;

diff --git a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
index e4c23894d9..cae9d4fbf4 100644
--- a/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
+++ b/tests/Perspex.RenderTests/Media/VisualBrushTests.cs
@@ -83,7 +83,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_NoStretch_NoTile_Alignment_Center()
         {
             Decorator target = new Decorator
@@ -133,7 +137,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Fill_NoTile()
         {
             Decorator target = new Decorator
@@ -156,7 +164,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_Uniform_NoTile()
         {
             Decorator target = new Decorator
@@ -179,7 +191,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_UniformToFill_NoTile()
         {
             Decorator target = new Decorator
@@ -226,7 +242,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_NoStretch_NoTile_BottomRightQuarterDest()
         {
             Decorator target = new Decorator
@@ -356,7 +376,11 @@ namespace Perspex.Direct2D1.RenderTests.Media
             CompareImages();
         }
 
+#if PERSPEX_CAIRO
+        [Fact(Skip = "Font scaling currently broken on cairo")]
+#else
         [Fact]
+#endif
         public void VisualBrush_NoStretch_FlipXY_TopLeftDest()
         {
             Decorator target = new Decorator