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

Implement wxD2DGradientStopsHelper as a wxD2DResourceHolder

Browse Source 
There is a dedicated template class wxD2DResourceHolder<T> to support
managing backend D2D resources and wxD2DGradientStopsHelper should be
derived from wxD2DResourceHolder<ID2D1GradientStopCollection> for the
sake of consistency with other D2D resource holders.
This commit is contained in:
Artur Wieczorek
2020-02-09 20:46:40 +01:00
parent c7c3f337c2
commit 55daa7103e
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/msw/graphicsd2d.cpp
View File

@@ -2314,33 +2314,32 @@ wxD2DBitmapData* wxGetD2DBitmapData(const wxGraphicsBitmap& bitmap)
} }
// Helper class used to create and safely release a ID2D1GradientStopCollection from wxGraphicsGradientStops // Helper class used to create and safely release a ID2D1GradientStopCollection from wxGraphicsGradientStops
class wxD2DGradientStopsHelper class wxD2DGradientStopsHelper : public wxD2DResourceHolder<ID2D1GradientStopCollection>
{ {
public: public:
wxD2DGradientStopsHelper(const wxGraphicsGradientStops& gradientStops, ID2D1RenderTarget* renderTarget) wxD2DGradientStopsHelper(const wxGraphicsGradientStops& gradientStops)
{ {
int stopCount = gradientStops.GetCount(); const int stopCount = gradientStops.GetCount();
m_gradientStops.reserve(stopCount);
D2D1_GRADIENT_STOP* gradientStopArray = new D2D1_GRADIENT_STOP[stopCount]; for ( int i = 0; i < stopCount; ++i )
for (int i = 0; i < stopCount; ++i)
{ {
gradientStopArray[i].color = wxD2DConvertColour(gradientStops.Item(i).GetColour()); D2D1_GRADIENT_STOP stop;
gradientStopArray[i].position = gradientStops.Item(i).GetPosition(); stop.position = gradientStops.Item(i).GetPosition();
stop.color = wxD2DConvertColour(gradientStops.Item(i).GetColour());
m_gradientStops.push_back(stop);
} }
renderTarget->CreateGradientStopCollection(gradientStopArray, stopCount, D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &m_gradientStopCollection);
delete[] gradientStopArray;
} }
ID2D1GradientStopCollection* GetGradientStopCollection() protected:
void DoAcquireResource() wxOVERRIDE
{ {
return m_gradientStopCollection; HRESULT hr = GetContext()->CreateGradientStopCollection(m_gradientStops.data(),
m_gradientStops.size(), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &m_nativeResource);
wxCHECK_HRESULT_RET(hr);
} }
private: private:
wxCOMPtr<ID2D1GradientStopCollection> m_gradientStopCollection; wxVector<D2D1_GRADIENT_STOP> m_gradientStops;
}; };
template <typename B> template <typename B>
@@ -2443,13 +2442,14 @@ public:
protected: protected:
void DoAcquireResource() wxOVERRIDE void DoAcquireResource() wxOVERRIDE
{ {
wxD2DGradientStopsHelper helper(m_linearGradientInfo.stops, GetContext()); wxD2DGradientStopsHelper helper(m_linearGradientInfo.stops);
helper.Bind(GetManager());
HRESULT hr = GetContext()->CreateLinearGradientBrush( HRESULT hr = GetContext()->CreateLinearGradientBrush(
D2D1::LinearGradientBrushProperties( D2D1::LinearGradientBrushProperties(
D2D1::Point2F(m_linearGradientInfo.x1, m_linearGradientInfo.y1), D2D1::Point2F(m_linearGradientInfo.x1, m_linearGradientInfo.y1),
D2D1::Point2F(m_linearGradientInfo.x2, m_linearGradientInfo.y2)), D2D1::Point2F(m_linearGradientInfo.x2, m_linearGradientInfo.y2)),
helper.GetGradientStopCollection(), helper.GetD2DResource(),
&m_nativeResource); &m_nativeResource);
wxCHECK_HRESULT_RET(hr); wxCHECK_HRESULT_RET(hr);
@@ -2494,7 +2494,8 @@ public:
protected: protected:
void DoAcquireResource() wxOVERRIDE void DoAcquireResource() wxOVERRIDE
{ {
wxD2DGradientStopsHelper helper(m_radialGradientInfo.stops, GetContext()); wxD2DGradientStopsHelper helper(m_radialGradientInfo.stops);
helper.Bind(GetManager());
wxDouble xo = m_radialGradientInfo.x1 - m_radialGradientInfo.x2; wxDouble xo = m_radialGradientInfo.x1 - m_radialGradientInfo.x2;
wxDouble yo = m_radialGradientInfo.y1 - m_radialGradientInfo.y2; wxDouble yo = m_radialGradientInfo.y1 - m_radialGradientInfo.y2;
@@ -2504,7 +2505,7 @@ protected:
D2D1::Point2F(m_radialGradientInfo.x1, m_radialGradientInfo.y1), 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.GetD2DResource(),
&m_nativeResource); &m_nativeResource);
wxCHECK_HRESULT_RET(hr); wxCHECK_HRESULT_RET(hr);