Before:

After:

Thanks! I like the new behaviour much more 👍

I wonder if we can consolidate things a bit to avoid all the separate cases, e.g something like

if (StrokeText) {
    g.SetSourceColor (FillText ? CurrentTextEngine.SecondaryColor : CurrentTextEngine.PrimaryColor);
    ...
    g.Stroke ();
}

if (FillText) {
    g.MoveTo (CurrentTextEngine.Origin.X, CurrentTextEngine.Origin.Y);
    g.SetSourceColor (CurrentTextEngine.PrimaryColor);
    PangoCairo.Functions.ShowLayout (g, CurrentTextLayout.Layout);
}

Done! I placed g.MoveTo() and g.SetSourceColor() inside if (StrokeText) because it is only needed because g.Stroke() resets state. Should be cleaner now.