cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support transparency for brush patterns in wxSVGFileDC

Browse Source 
Include the alpha value in the pattern name.
This commit is contained in:
Maarten Bent 2020-03-01 22:17:41 +01:00
parent 7d2f6b4608
commit 759723795e
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/dcsvg.cpp
View File

@ -270,6 +270,9 @@ wxString GetBrushStyleName(const wxBrush& brush)
break;
}
if (!brushStyle.empty())
brushStyle += wxString::Format(wxS("%s%02X"), Col2SVG(brush.GetColour()).substr(1), brush.GetColour().Alpha());
return brushStyle;
}
@ -279,7 +282,7 @@ wxString GetBrushPattern(const wxBrush& brush)
wxString brushStyle = GetBrushStyleName(brush);
if (!brushStyle.empty())
s = wxS("fill=\"url(#") + brushStyle + Col2SVG(brush.GetColour()).substr(1) + wxS(")\"");
s = wxString::Format(wxS("fill=\"url(#%s)\""), brushStyle);
return s;
}
@ -339,13 +342,14 @@ wxString CreateBrushFill(const wxBrush& brush, wxSVGShapeRenderingMode mode)
break;
}
wxString brushColourStr = Col2SVG(brush.GetColour());
float opacity;
wxString brushColourStr = Col2SVG(brush.GetColour(), &opacity);
wxString brushStrokeStr = wxS("stroke-width:1; stroke-linecap:round; stroke-linejoin:round;");
s += wxString::Format(wxS(" <pattern id=\"%s%s\" patternUnits=\"userSpaceOnUse\" width=\"8\" height=\"8\">\n"),
patternName, brushColourStr.substr(1));
s += wxString::Format(wxS(" <path style=\"stroke:%s; stroke-opacity:1.0; %s\" %s %s/>\n"),
brushColourStr, brushStrokeStr, pattern, GetRenderMode(mode));
s += wxString::Format(wxS(" <pattern id=\"%s\" patternUnits=\"userSpaceOnUse\" width=\"8\" height=\"8\">\n"),
patternName);
s += wxString::Format(wxS(" <path style=\"stroke:%s; stroke-opacity:%s; %s\" %s %s/>\n"),
brushColourStr, NumStr(opacity), brushStrokeStr, pattern, GetRenderMode(mode));
s += wxS(" </pattern>\n");
}