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

Like Direct2D inverting the matrix is needed for gradient transforms

Browse Source
This commit is contained in:
Robin Dunn
2019-08-02 23:03:45 -07:00
parent fc35d8b49b
commit 1e37cca162
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/msw/graphics.cpp
View File

@@ -752,7 +752,7 @@ wxGDIPlusPenBrushBaseData::CreateLinearGradientBrush(
wxDouble x1, wxDouble y1, wxDouble x1, wxDouble y1,
wxDouble x2, wxDouble y2, wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& WXUNUSED(matrix)) const wxGraphicsMatrix& matrix)
{ {
LinearGradientBrush * const LinearGradientBrush * const
brush = new LinearGradientBrush(PointF(x1, y1) , PointF(x2, y2), brush = new LinearGradientBrush(PointF(x1, y1) , PointF(x2, y2),
@@ -762,14 +762,13 @@ wxGDIPlusPenBrushBaseData::CreateLinearGradientBrush(
// Tell the brush how to draw what's beyond the ends of the gradient // Tell the brush how to draw what's beyond the ends of the gradient
brush->SetWrapMode(WrapModeTileFlipXY); brush->SetWrapMode(WrapModeTileFlipXY);
// Apply the matrix // Apply the matrix if there is one
// This doesn't work as I expected it to. Comment-out for now... if (! matrix.IsNull())
// FIXME {
// if (! matrix.IsNull()) Matrix* m = static_cast<Matrix*>(matrix.GetNativeMatrix());
// { m->Invert();
// const Matrix* m = static_cast<const Matrix*>(matrix.GetNativeMatrix()); brush->MultiplyTransform(m);
// brush->SetTransform(m); }
// }
SetGradientStops(brush, stops); SetGradientStops(brush, stops);
m_brush = brush; m_brush = brush;
@@ -781,7 +780,7 @@ wxGDIPlusPenBrushBaseData::CreateRadialGradientBrush(
wxDouble xc, wxDouble yc, wxDouble xc, wxDouble yc,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops, const wxGraphicsGradientStops& stops,
const wxGraphicsMatrix& WXUNUSED(matrix)) const wxGraphicsMatrix& matrix)
{ {
m_brushPath = new GraphicsPath(); m_brushPath = new GraphicsPath();
m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius), m_brushPath->AddEllipse( (REAL)(xc-radius), (REAL)(yc-radius),
@@ -795,14 +794,16 @@ wxGDIPlusPenBrushBaseData::CreateRadialGradientBrush(
int count = 1; int count = 1;
brush->SetSurroundColors(&col, &count); brush->SetSurroundColors(&col, &count);
// Apply the matrix // TODO: There doesn't seem to be an equivallent for SetWrapMode, so
// This doesn't work as I expected it to. Comment-out for now... // the area outside of the gradient's radius is not getting painted.
// FIXME
// if (! matrix.IsNull()) // Apply the matrix if there is one
// { if (! matrix.IsNull())
// const Matrix* m = static_cast<const Matrix*>(matrix.GetNativeMatrix()); {
// brush->SetTransform(m); Matrix* m = static_cast<Matrix*>(matrix.GetNativeMatrix());
// } m->Invert();
brush->SetTransform(m);
}
// Because the GDI+ API draws radial gradients from outside towards the // Because the GDI+ API draws radial gradients from outside towards the
// center we have to reverse the order of the gradient stops. // center we have to reverse the order of the gradient stops.