Skip to content

When drawing a text with outline, draws fill after stroke and not before #1426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cameronwhite merged 5 commits into from
May 9, 2025
Merged

When drawing a text with outline, draws fill after stroke and not before #1426

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75f69c7
When drawing a text with outline, draws fill after stroke and not before
pedropaulosuzuki May 8, 2025
a8680c4
Fix whitespace
pedropaulosuzuki May 8, 2025
a0adeef
Small refactor on text tool to improve readability
pedropaulosuzuki May 8, 2025
78c7fe4
Update TextTool.cs
pedropaulosuzuki May 8, 2025
b6b90c1
Merge branch 'PintaProject:master' into patch-2
pedropaulosuzuki May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions Pinta.Tools/Tools/TextTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,22 +1029,24 @@ private void RedrawText (bool showCursor, bool useTextLayer)
g2.FillRectangle (CurrentTextLayout.GetLayoutBounds ().ToDouble (), CurrentTextEngine.SecondaryColor);
}

// Draw the text
if (FillText)
PangoCairo.Functions.ShowLayout (g, CurrentTextLayout.Layout);

if (FillText && StrokeText) {
g.SetSourceColor (CurrentTextEngine.SecondaryColor);
// Draws the text stroke
if (StrokeText) {
g.SetSourceColor (FillText ? CurrentTextEngine.SecondaryColor : CurrentTextEngine.PrimaryColor);
g.LineWidth = OutlineWidth;

PangoCairo.Functions.LayoutPath (g, CurrentTextLayout.Layout);
g.Stroke ();
} else if (StrokeText) {
g.SetSourceColor (CurrentTextEngine.PrimaryColor);
g.LineWidth = OutlineWidth;

PangoCairo.Functions.LayoutPath (g, CurrentTextLayout.Layout);
g.Stroke ();
// Position resets after g.Stroke ();
if (FillText) {
g.MoveTo (CurrentTextEngine.Origin.X, CurrentTextEngine.Origin.Y);
g.SetSourceColor (CurrentTextEngine.PrimaryColor);
}
}

// Draws the text fill
if (FillText) {
PangoCairo.Functions.ShowLayout (g, CurrentTextLayout.Layout);
}

if (showCursor) {
Expand Down