From 3d845f95272a06c4f0f901423319ad85cc19f159 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 15 Sep 2015 01:42:09 +0200
Subject: [PATCH] Fixed failing Border render tests.

They were failing because passing a Pango.Context to FormattedTextImpl
was a hack. Create a pango context on startup that can be used for all
FormattedTextImpls. Fix the expected test output for tests containing
text as the expected output came from the Direct2D renderer where text
rendering is slightly different.
---
 src/Gtk/Perspex.Cairo/CairoPlatform.cs        |  19 ++++++------------
 .../Perspex.Cairo/Media/FormattedTextImpl.cs  |   4 +++-
 .../Border_Bottom_Aligns_Content.expected.png | Bin 797 -> 761 bytes
 ..._Centers_Content_Horizontally.expected.png | Bin 830 -> 760 bytes
 ...er_Centers_Content_Vertically.expected.png | Bin 811 -> 771 bytes
 .../Border_Left_Aligns_Content.expected.png   | Bin 838 -> 743 bytes
 .../Border_Right_Aligns_Content.expected.png  | Bin 800 -> 734 bytes
 .../Border_Top_Aligns_Content.expected.png    | Bin 801 -> 758 bytes
 8 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/Gtk/Perspex.Cairo/CairoPlatform.cs b/src/Gtk/Perspex.Cairo/CairoPlatform.cs
index 5ddfe1eab0..f25aadda95 100644
--- a/src/Gtk/Perspex.Cairo/CairoPlatform.cs
+++ b/src/Gtk/Perspex.Cairo/CairoPlatform.cs
@@ -17,6 +17,8 @@ namespace Perspex.Cairo
     {
         private static readonly CairoPlatform s_instance = new CairoPlatform();
 
+        private static Pango.Context s_pangoContext = CreatePangoContext();
+
         public static void Initialize()
         {
             var locator = Locator.CurrentMutable;
@@ -36,12 +38,11 @@ namespace Perspex.Cairo
             TextAlignment textAlignment,
             Perspex.Media.FontWeight fontWeight)
         {
-            return new FormattedTextImpl(text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight);
+            return new FormattedTextImpl(s_pangoContext, text, fontFamily, fontSize, fontStyle, textAlignment, fontWeight);
         }
 
         public IRenderer CreateRenderer(IPlatformHandle handle, double width, double height)
         {
-            Locator.CurrentMutable.RegisterConstant(GetPangoContext(handle), typeof(Pango.Context));
             return new Renderer(handle, width, height);
         }
 
@@ -69,18 +70,10 @@ namespace Perspex.Cairo
             return new BitmapImpl(pixbuf);
         }
 
-        private Pango.Context GetPangoContext(IPlatformHandle handle)
+        private static Pango.Context CreatePangoContext()
         {
-            switch (handle.HandleDescriptor)
-            {
-                case "GtkWindow":
-                    var window = GLib.Object.GetObject(handle.Handle) as Gtk.Window;
-                    return window.PangoContext;
-                default:
-                    throw new NotSupportedException(string.Format(
-                        "Don't know how to get a Pango Context from a '{0}'.",
-                        handle.HandleDescriptor));
-            }
+            Gtk.Application.Init();
+            return new Gtk.Invisible().CreatePangoContext();
         }
     }
 }
diff --git a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
index b61a6c6c15..81ae567817 100644
--- a/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
+++ b/src/Gtk/Perspex.Cairo/Media/FormattedTextImpl.cs
@@ -15,6 +15,7 @@ namespace Perspex.Cairo.Media
         private Size _size;
 
         public FormattedTextImpl(
+            Pango.Context context,
             string text,
             string fontFamily,
             double fontSize,
@@ -22,7 +23,8 @@ namespace Perspex.Cairo.Media
             TextAlignment textAlignment,
             FontWeight fontWeight)
         {
-            var context = Locator.Current.GetService<Pango.Context>();
+            Contract.Requires<NullReferenceException>(context != null);
+
             Layout = new Pango.Layout(context);
             Layout.SetText(text);
             Layout.FontDescription = new Pango.FontDescription
diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Bottom_Aligns_Content.expected.png
index 163e53293fc42a63090e5b3a09791835bf86ce72..97ad2127019cab5521f2e18160fd8abd650b2239 100644
GIT binary patch
literal 761
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu_bxCyD<C*!3BGlPiA0XTIcEF
z7*a9k?XBp%C_@p4i^Z#XRC&~7J)U1axutnw@j`i(SIQaJSEw@Xn&u+6$^K8F`8MY?
zph-aR?(#N+=LH`_5BxsKX1C|6)&nuyIfmt_+Z&@dmKbenb`aoTX&fa6T^O{qU+rw4
zd017PDL*rMPC9#|f&fQ4>!!coe${k}9u$q-*SzP(`7@7M#h9+25ad2&&-vu`pQ<mv
zc3H4pfA_|r?DMb0`)AKgxBMqtVQ(z|T;kaLV-Ifq{VMz9X<~iVzke3S^XEPH?b&&}
zfcuW4!kU@|6%{`>oqbvUKezArishE?G<N^|xUstTVD(MEe?M;BbYBzvt+?hx{lD5&
zo^^L4tvT*=UzI%~%hKeapmX0b?7ywVyG~gaaB^e#=X{@0p+@b#r`NO(AQ4YjKbLh*
G2~7Y+C+3_0

literal 797
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg>A0thV@O5Z+nWb{?>I;_TvRQ6A`-;*vRN$1ON-OAz)j{wqs(QtnVmT)
zieC<@DIBQs|7Ey_KjvBV`4j9w;}{qk=2}Irdz!cNkX$PB{At=B`kx6O32xb2d2QD>
zmPQ2u4yI9JkcC0PrkK-r|MK7HJbUOon~kFa2TPNKf{f^i>xRXLx1BpGabxr1`3l>U
zpEcH=`}v2V?2H)qp>7tV?NPVaUcWjc^ltO_ymdF1-`USTGkwC&qfuw?*Z2Q4ORM$&
zlzryqjOFiYXUZRtzNzyk=fVDS3dIxS`+pjyncDxhdzR*Nx4Hkp)pH8-r@u~qCAUZ2
zJ%6L#@tp1MpM5^wFw6QE`~89L-dkd?7j8DRKYr%FQMzriPbt4$)0*^;-?{H^x2xV1
y`Qv88cLf0!riVA9b#7=z>wwZ914F{=f*;J+jZAx%e2_c<67Y2Ob6Mw<&;$Sx0qU9n

diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Horizontally.expected.png
index 18ecd01c7a707b53da0ef2d890604cd900c6658c..77a7601e1348985970742148a38a0d56bb43d6ea 100644
GIT binary patch
literal 760
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu_bxCyD<C*!3BGlPiA0XTI=cJ
z7*a9k?XAGPTLugbiN;?wtZ%>Dd^)E+vHWA)s?x=e)(d7jZ+<^{0>krzjQ@)SB$<Kc
zFfcrr;m3XaO!<7)H|o+qJ_T-WIRD~hTXJ}r^tu_+?~kb8KfZU`K7MNsmPQAG6YN&8
zHv8UN%ZlCkB;CS0=eR`t_jxR*-zW&Md}65Ut=HdMr`PvU;@OAvhj*Wye*WY6$K)PM
z{dx1}$Irhnar?awU-ITs-3h#Bx?An_#s1!ZUt8U`=vbNET;+(U>v|g>_?1oIjk)c(
zF4k?Y>9*G=WtzR$xCb@PiMM+kemq9{_Q#OEq|Dg+Mds_P>)$<yThqRI%eud8jS2!B
yOryl04TFLxi?n^ebrS4vHpsGo6CA@o=lzUQ;)`6uVv{d`L_A&nT-G@yGywqno70y7

literal 830
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg>4m3@V@O5Z+ZzXaFFP<eT#SA7fW^dJGlZ$O!Quk*R-MN;9IHF(_gHi}
zeVS(?rQKH~@jLsC4I|Jb28KH;pQq~SpXT|lAziWk%mL2)n~vLRri&&E>hBWn?|xYI
zX7kH^+nOB&I9M7T1Wt(7N+nl4u<grF{_uZxT$<jmrk@?lrhn;A{v(%cb<cX*{HOPQ
zvn$GE-zo^O6frMzUwgej&i<Iis^U9szR`lYIu9NSX4}m<{$<D4TFZIo{F8s>oZe};
z`Fx`8^TVZO6SSqxzu(vXoY*rzxkmDF#;-S@CH5a%Q5@6mkay*Gs@>9ag|)M{Dcy=V
zF!_JdT3ffd*5+y7EZ01(*>V18-HVC6tTBIQe}66UIsDnjU)I^rj~V`!xo+ZH-!rH9
z&qUq(sYjRQzbZ70>8~}rd;OlH0tZWz!zeL0!{E?oqv_LA+p4GV-T<a^5P0y=#`Z5`
W*VXkN(Y8IWK_Z^6elF{r5}E-2Z3vhE

diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Centers_Content_Vertically.expected.png
index 40d0de862e67aece91107818bf74358ffe747ff0..ff0c7b5984aefce2ee2ff9f1a41a6edbf81afe1f 100644
GIT binary patch
delta 356
zcmV-q0h|7-27?BWBy0v^OGiWi{{a60|De66lK=n$xJg7oRCt{2+FNc~F%&@2b1Q}t
z29pk?^XX*T!O*$T4-)kev}@FoK)RMh9<o3DaW}R@W&i*H0002qr)^=*@#?F9x04Ng
zc&$~yJ=$F`cV)MMd$DvfvV)Uh0-lpl0xN&mtxi179Iv?$cum{lJUa*kfk3z@knOkE
z=WDD8ZpiW-<k?|n9<HzuxJ8aw5dKLZ-{#k&*Vn}{xOEo?vY(d^`+jD=%<1pIhne{}
zr!f9B2Dk37?;y_)`{UF1hne~GG;d<eJ%)SW4gz821I6R>mu=3!`)_kPMm^4HN7**d
zkB{AJ4BpCi_Q#hlK4P77nA3y*^Y1HTaO*DGLEybu-9g+zAP5A)@*QMb{|{lf2TQjG
zJClI|ev?oFPAS-3F!y-1Rltq1g8%>k0002Mf9N}#*eKxk&2vlu0000<MNUMnLSTXf
CxU4t;

literal 811
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg>8huTV@O5Z+nbJlB90Ob7bVX>^s;5Ub6C4V#D7tGfp0_wdrVdD##1Ge
z`xNDSJQ}|3eX=~E>fo|{FJFCO1e(Xdkg&Y(bd=v|uIeegdm_Ug=%2Oj*v(P>c|q-4
zJ|;&60hZxFJlwJ7X~}QqvZT!)H#3$Ca4<D02ympceo8!JvtjM$Ql2+AZ<bG(ZTPvd
z_T2HGjBjQri?!4Xov_Ku?T-sj4lCu2+qE<OeerL(6uag#%Ga{~{VP86bjDZPll_M8
zkKZYOd-o5+ypw5<)0z9L*k;cDQ+4LK;p(3^mmA(ce#NwccitPxCvP|1Te|L`chNV&
z*SBZ9{g`1Fe5bT$R{eF;3P1m{Bfl;mouQxntbXQZyJR1rZOv=aKmO*vzum5S)6E|@
z8@_{Lq2I(m+%MwI+2(IstvOg49R!90(eilHw9A_g$)z&CQvfDKAoy_KQl^fv@2F+l
S!(W<nKq8*5elF{r5}E+wX7E=4

diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Left_Aligns_Content.expected.png
index 73be4dcdc681499910fec417ba65e4cab9a23a79..5f0166406b236459cb9bac884ad96469e7814b39 100644
GIT binary patch
literal 743
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu_bxCyD<C*!3BGlPiA0Xn&au>
z7*a9k?X5(=M-B`P7Y|m5oPSokr$>(M{iVN(Djr{oW1<RgexJnl!X(Ax+36`ul7Yqm
z!JTDykC>i*wz=W;Nw#-&Sz;gbcg^2h@HRKae0%l5uw~P>$g(s!DAZ_AxO?;CmZLon
z#Ap8FFWMrXY?EUk_@nnul4FGGgzF#wU3;Bc#FKZ>=vc(G!>?a{tSS2UqptqPp8rX2
zvi7sxlezxUDt^lx-9JxrF3z7<ZQ~M{obAJ-XCT_~U!h>(9Y?#}y}z>F%(CY==6^S7
zuHK)I2TkYqt~E5=aUewDvj68Qv2N+&m`n4XweD9H;9zQ07$pX27;KomBkg95Sb^=$
h23Zzx`eOL!Tn|jO3tY^m9=-??@pScbS?83{1OOxT(y9Oe

literal 838
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg>4T?>V@O5Z+goRIuLMXq1h(_~9%!1sD5EiG1<NmnMi<r`0go$;4{eW&
zMf&7%aLzKAqg?xW&c_ql@jrbh0Sy3x2QG7Svn}t3S-9Rj(45Q4_v5YliC8<gV_Wz2
z8O_hJKV<l3`xbSMKbnmW0vs*Ute<Mm+}ZH<a~jW_P15#`cKtK&=RMmqBmV&B=A%so
z>WydCUVFOs`fkJBR_x0Y?gsWw|D3+REc|uP+iO2>zpa=z-}wIScXyVj{xl1-SoSq;
zkHwx_YxgzV$bPOnv)XX?&wHm0<&VddzB|0hCgy%a^}F@8?3G*Aw%f!_dw*N;&*y9G
z$0{PXM-<OC>HoenOFHy<ozCg$8xI+-{r>3a!?$b1XPN(4=<sZh+~)ecb5GC9Sg8xV
zYy3OU=d-x?^+^4qw^Q>HVouv@7v=ocoy+^fnu7)8rBPyVhJnTHYeoCk7IbZ5^cMi9
eQ-&Y!bx!-6X>_?Q<`GQ>33<BuxvX<aXaWF=HV82Q

diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Right_Aligns_Content.expected.png
index 3db06328cc5d29dc31b062d6833825107e5b9883..3ee5e25b7ce81604697dd051c4bb05b644e91ebf 100644
GIT binary patch
literal 734
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yu_bxCyD<C*!3BGlPiA0Xn(XP~
z7*a9k?JY;YLk<iM7Y|m5oPSokr$>(My-{9|m+(H<Mz&i0OeUYnWrp^~yt2$dQy3T?
z<lkCrkskL)FTwiefxBDZG38zS%lUj=WbOl{XEV!<veh?>vNSm;aJ0<c7%k%;zT=tZ
zd4&x-|4KZ5*mZq#lY;<<`TJ6tyuEQ@eREIC{L@KE{#-0qCv!ge%+4Qs>i_TipO!PH
zFpj(B?AfD7=68Gk|GNG7ca5x^HFK_Si}>IjCSX>c!)m#$_g7xdjiis$LlnBxyPAvp
zdV8mS{xxNL<=*b2X?j2Orfsi$xSWN_Q9)po7_4DXrhRUv_<rsier5@*jG%<Y&`|$^
Xx4>Y5i_2A}*C4*9tDnm{r-UW|G>xxO

literal 800
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-V}>VM%xNb!1@J
z*w6hZk(Ggg>6E97V@O5Z+glfNF9%38T%6)4ki>T{QB*8}eMXC|gUtr!B;iAQr}AoM
z**QgV3!R%-cUNWGrzif`^L8-<jbmWg5oCTk>f33q>l)G(o7Nn#{g=XS`84Lnk?nWi
zz23nvUpHU=&4Z+E%?Ea}FgYp+upByCVVY)Vu;z2#nQJVETz?v*{kxiRZuZZE$3XHi
zd-{|4^7r2BkG#6^_@;LmAFiLd?-=)Qk63>CoxHdEb=E((io0`8^Z2t}KAV~g0{P}U
z#`XNPdG>Y2^W?Dn<26#j$Nf|V)?K=sy4PRU`nYGbU{2=VqqDZVKTi5%csy_Mv)@)`
z*Hh)*T-?WTu2g4&<$jysJC@IHY-~P%sb<6fxnI5gEXB<p&KG?suOh&~)Tl5@49YNo
mC%6sGpcKf!aG*YY`)@vxE3GMuUHxBxL_A&nT-G@yGywo_59XZ!

diff --git a/tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png b/tests/TestFiles/Cairo/Controls/Border/Border_Top_Aligns_Content.expected.png
index 1c48ec82c6db22a4c459a5c16d17f35325487b8f..ca04ee9121003564bc934fe149f4116418b6c783 100644
GIT binary patch
delta 332
zcmV-S0ki(02KEJzB!32COGiWi{{a60|De66lK=n$t4TybRCt{2+RbfRK^Q>MkI1E%
zVw^(KPnt=JA-y;Yu<~PcGbq7+kaHwtqnX7l-u28FW&i*H0002)({5qT^VL@Y?<X7h
z@K&pUTlBCx(Kf<8Svfk**g+r(1j0pu?0$QFzQ&4RLzeF#FMkd*^LT}Yz!o`TLHH+u
ze4Ag7USAi-VCyapWIwMT_WjI!nd85L4>R*|j$!<147TpC?;tM^`_t*?<IH?I&6^l=
zkKq=$gFsmRF4psD^0~kMyEz`Cp60lt?B~ZP?==SRWq0=1*DgL{opYGuga7mUl`+`5
zi*^vW7ppsnI}!*4fk0TkgY4G7Aq=-*>DFKevvC210h4e66e$lE%zeJvDqy4RAOHXW
e0002+ANmd!s3za4rCZnl0000<MNUMnLSTYN{hg-(

delta 377
zcmV-<0fzqe1)&CzB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0008ZNkl<ZcwX(<
zK~5Aw7=Y2ibGQ<Zq4(el9)**@8C)9|-a(gM1FJ|k>6pm}BM_i{FZt8Zy_ijZQ&pJ*
z000000KiV2E!T3hTw#y0fp^OlIO4%8h-HL5*}V8x5cpRDfqx(n2qy*dam?JXt#dsF
z_Uz;p<mZ@qV4rg_Z@`Y(VnKM4K;~9!yY>1uW>wGNwVUtkeeQk-nP-r>#ahk3e~<Y*
zX8oPy*O>D$_dWYCZ@>%Ly!hF`qs}1nCI3F=a?EPp`!eRon0f|p!Lyw~-Y?f<>KVKy
zCvUO7j@fRH<~^C>*fwhZU(etrJ=+%RZ=c3ojhUY^XFX#~^$gyEtY>lih3{LRJ=whY
z*?`|cAP58=Y3{D<u-Kaiz1LQ=fdNbblVAZ$D`(5K+$>kvqinzm0ssI200030ox|Y|
X!&Nnm!C(Q>00000NkvXXu0mjfOO3ST