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

Don't use a wxRect to hold floating point values!!

Browse Source
This commit is contained in:
Robin Dunn
2019-08-02 20:06:45 -07:00
parent a8eeab3af2
commit 2571f5962c
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/msw/graphicsd2d.cpp
View File

@@ -2425,14 +2425,17 @@ class wxD2DLinearGradientBrushResourceHolder : public wxD2DResourceHolder<ID2D1L
{ {
public: public:
struct LinearGradientInfo { struct LinearGradientInfo {
const wxRect direction; const wxDouble x1;
const wxDouble y1;
const wxDouble x2;
const wxDouble y2;
const wxGraphicsGradientStops stops; const wxGraphicsGradientStops stops;
const wxGraphicsMatrix matrix; const wxGraphicsMatrix matrix;
LinearGradientInfo(wxDouble& x1, wxDouble& y1, LinearGradientInfo(wxDouble& x1_, wxDouble& y1_,
wxDouble& x2, wxDouble& y2, wxDouble& x2_, wxDouble& y2_,
const wxGraphicsGradientStops& stops_, const wxGraphicsGradientStops& stops_,
const wxGraphicsMatrix& matrix_) const wxGraphicsMatrix& matrix_)
: direction(x1, y1, x2, y2), stops(stops_), matrix(matrix_) {} : x1(x1_), y1(y1_), x2(x2_), y2(y2_), stops(stops_), matrix(matrix_) {}
}; };
wxD2DLinearGradientBrushResourceHolder(wxDouble& x1, wxDouble& y1, wxD2DLinearGradientBrushResourceHolder(wxDouble& x1, wxDouble& y1,
@@ -2449,8 +2452,8 @@ protected:
HRESULT hr = GetContext()->CreateLinearGradientBrush( HRESULT hr = GetContext()->CreateLinearGradientBrush(
D2D1::LinearGradientBrushProperties( D2D1::LinearGradientBrushProperties(
D2D1::Point2F(m_linearGradientInfo.direction.GetX(), m_linearGradientInfo.direction.GetY()), D2D1::Point2F(m_linearGradientInfo.x1, m_linearGradientInfo.y1),
D2D1::Point2F(m_linearGradientInfo.direction.GetWidth(), m_linearGradientInfo.direction.GetHeight())), D2D1::Point2F(m_linearGradientInfo.x2, m_linearGradientInfo.y2)),
helper.GetGradientStopCollection(), helper.GetGradientStopCollection(),
&linearGradientBrush); &linearGradientBrush);
wxCHECK_HRESULT_RET(hr); wxCHECK_HRESULT_RET(hr);
@@ -2471,17 +2474,20 @@ class wxD2DRadialGradientBrushResourceHolder : public wxD2DResourceHolder<ID2D1R
{ {
public: public:
struct RadialGradientInfo { struct RadialGradientInfo {
const wxRect direction; const wxDouble x1;
const wxDouble y1;
const wxDouble x2;
const wxDouble y2;
const wxDouble radius; const wxDouble radius;
const wxGraphicsGradientStops stops; const wxGraphicsGradientStops stops;
const wxGraphicsMatrix matrix; const wxGraphicsMatrix matrix;
RadialGradientInfo(wxDouble x1, wxDouble y1, RadialGradientInfo(wxDouble x1_, wxDouble y1_,
wxDouble x2, wxDouble y2, wxDouble x2_, wxDouble y2_,
wxDouble r, wxDouble r,
const wxGraphicsGradientStops& stops_, const wxGraphicsGradientStops& stops_,
const wxGraphicsMatrix& matrix_) const wxGraphicsMatrix& matrix_)
: direction(x1, y1, x2, y2), radius(r), stops(stops_), matrix(matrix_) {} : x1(x1_), y1(y1_), x2(x2_), y2(y2_), radius(r), stops(stops_), matrix(matrix_) {}
}; };
wxD2DRadialGradientBrushResourceHolder(wxDouble& x1, wxDouble& y1, wxD2DRadialGradientBrushResourceHolder(wxDouble& x1, wxDouble& y1,
@@ -2497,12 +2503,13 @@ protected:
wxD2DGradientStopsHelper helper(m_radialGradientInfo.stops, GetContext()); wxD2DGradientStopsHelper helper(m_radialGradientInfo.stops, GetContext());
ID2D1RadialGradientBrush *radialGradientBrush; ID2D1RadialGradientBrush *radialGradientBrush;
int xo = m_radialGradientInfo.direction.GetLeft() - m_radialGradientInfo.direction.GetWidth(); // TODO: double check this. The other backends just use the passed in values for xo, yo
int yo = m_radialGradientInfo.direction.GetTop() - m_radialGradientInfo.direction.GetHeight(); wxDouble xo = m_radialGradientInfo.x1 - m_radialGradientInfo.x2;
wxDouble yo = m_radialGradientInfo.y1 - m_radialGradientInfo.y2;
HRESULT hr = GetContext()->CreateRadialGradientBrush( HRESULT hr = GetContext()->CreateRadialGradientBrush(
D2D1::RadialGradientBrushProperties( D2D1::RadialGradientBrushProperties(
D2D1::Point2F(m_radialGradientInfo.direction.GetLeft(), m_radialGradientInfo.direction.GetTop()), D2D1::Point2F(m_radialGradientInfo.x1, m_radialGradientInfo.y1),
D2D1::Point2F(xo, yo), D2D1::Point2F(xo, yo),
m_radialGradientInfo.radius, m_radialGradientInfo.radius), m_radialGradientInfo.radius, m_radialGradientInfo.radius),
helper.GetGradientStopCollection(), helper.GetGradientStopCollection(),