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

Add gradient pen support for Cairo

Browse Source
This commit is contained in:
Robin Dunn
2019-07-30 23:43:48 -07:00
parent 4708d2539e
commit 59ce48924a
2 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/graphics.h
View File

@@ -479,6 +479,7 @@ public:
{ {
m_gradientType = wxGRADIENT_RADIAL; m_gradientType = wxGRADIENT_RADIAL;
m_x1 = xo; m_y1 = yo; m_x2 = xc; m_y2 = yc; m_x1 = xo; m_y1 = yo; m_x2 = xc; m_y2 = yc;
m_radius = radius;
m_stops.SetStartColour(oColor); m_stops.SetStartColour(oColor);
m_stops.SetEndColour(cColor); m_stops.SetEndColour(cColor);
return *this; return *this;
@@ -490,6 +491,7 @@ public:
{ {
m_gradientType = wxGRADIENT_RADIAL; m_gradientType = wxGRADIENT_RADIAL;
m_x1 = xo; m_y1 = yo; m_x2 = xc; m_y2 = yc; m_x1 = xo; m_y1 = yo; m_x2 = xc; m_y2 = yc;
m_radius = radius;
m_stops = stops; m_stops = stops;
return *this; return *this;
} }

40
src/generic/graphicc.cpp
View File

@@ -260,6 +260,13 @@ public:
virtual void Apply( wxGraphicsContext* context ); virtual void Apply( wxGraphicsContext* context );
void CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops);
void CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
wxDouble xc, wxDouble yc, wxDouble radius,
const wxGraphicsGradientStops& stops);
protected: protected:
// Call this to use the given bitmap as stipple. Bitmap must be non-null // Call this to use the given bitmap as stipple. Bitmap must be non-null
// and valid. // and valid.
@@ -268,6 +275,8 @@ protected:
// Call this to use the given hatch style. Hatch style must be valid. // Call this to use the given hatch style. Hatch style must be valid.
void InitHatch(wxHatchStyle hatchStyle); void InitHatch(wxHatchStyle hatchStyle);
// common part of Create{Linear,Radial}GradientBrush()
void AddGradientStops(const wxGraphicsGradientStops& stops);
double m_red; double m_red;
double m_green; double m_green;
@@ -316,18 +325,8 @@ public:
wxCairoBrushData( wxGraphicsRenderer* renderer ); wxCairoBrushData( wxGraphicsRenderer* renderer );
wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush ); wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush );
void CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops);
void CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
wxDouble xc, wxDouble yc, wxDouble radius,
const wxGraphicsGradientStops& stops);
protected: protected:
void Init(); void Init();
// common part of Create{Linear,Radial}GradientBrush()
void AddGradientStops(const wxGraphicsGradientStops& stops);
}; };
class wxCairoFontData : public wxGraphicsObjectRefData class wxCairoFontData : public wxGraphicsObjectRefData
@@ -732,6 +731,7 @@ wxCairoPenData::~wxCairoPenData()
void wxCairoPenData::Init() void wxCairoPenData::Init()
{ {
m_pattern = NULL;
m_lengths = NULL; m_lengths = NULL;
m_userLengths = NULL; m_userLengths = NULL;
m_width = 0; m_width = 0;
@@ -867,6 +867,20 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxGraphicsPe
} }
break; break;
} }
if (info.GetGradientType() == wxGRADIENT_LINEAR)
{
CreateLinearGradientBrush(info.GetX1(), info.GetY1(),
info.GetX2(), info.GetY2(),
info.GetStops());
}
if (info.GetGradientType() == wxGRADIENT_RADIAL)
{
CreateRadialGradientBrush(info.GetXO(), info.GetYO(),
info.GetXC(), info.GetYC(),
info.GetRadius(),
info.GetStops());
}
} }
void wxCairoPenData::Apply( wxGraphicsContext* context ) void wxCairoPenData::Apply( wxGraphicsContext* context )
@@ -911,7 +925,7 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer,
} }
} }
void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops) void wxCairoPenBrushBaseData::AddGradientStops(const wxGraphicsGradientStops& stops)
{ {
// loop over all the stops, they include the beginning and ending ones // loop over all the stops, they include the beginning and ending ones
const unsigned numStops = stops.GetCount(); const unsigned numStops = stops.GetCount();
@@ -937,7 +951,7 @@ void wxCairoBrushData::AddGradientStops(const wxGraphicsGradientStops& stops)
} }
void void
wxCairoBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1, wxCairoPenBrushBaseData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
wxDouble x2, wxDouble y2, wxDouble x2, wxDouble y2,
const wxGraphicsGradientStops& stops) const wxGraphicsGradientStops& stops)
{ {
@@ -947,7 +961,7 @@ wxCairoBrushData::CreateLinearGradientBrush(wxDouble x1, wxDouble y1,
} }
void void
wxCairoBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo, wxCairoPenBrushBaseData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
wxDouble xc, wxDouble yc, wxDouble xc, wxDouble yc,
wxDouble radius, wxDouble radius,
const wxGraphicsGradientStops& stops) const wxGraphicsGradientStops& stops)