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

Add support for creating Cairo pen from wxPen with non-solid colour

Browse Source 
Cairo colour patterns support only RGBA colours and therefore it is not
possible to create a colour pattern from wxPen with non-RGB colour
(non-solid colour). As a workaround under wxOSX for solid wxPen with
non-solid colour we can convert it to Cairo surface pattern (stiple)
because under wxOSX non-solid colour is actually represented by a pattern
image.
This commit is contained in:
Artur Wieczorek
2019-12-06 20:40:57 +01:00
parent 55478d95a5
commit 67b64ee70f
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/graphicc.cpp
View File

@@ -906,6 +906,25 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxGraphicsPe
switch ( info.GetStyle() )
{
case wxPENSTYLE_SOLID :
// Non-RGB colours, which may e.g. appear under wxOSX for wxColours
// with NSColor backend, are not supported by Cairo and have to be
// handled in a special way.
if ( !info.GetColour().IsSolid() )
{
#if wxOSX_USE_COCOA
// Under wxOSX, non-solid NSColors are actually represented
// by pattern images and therefore a wxPen with non-solid
// colour and wxPENSTYLE_SOLID style can be converted
// to a stiple (a surface pattern).
// Create a stiple bitmap from NSColor's pattern image
wxBitmap bmp(info.GetColour().OSXGetNSPatternImage());
InitStipple(&bmp);
#else
wxFAIL_MSG( "Pen with non-solid colour is not supported." );
#endif
}
break;
case wxPENSTYLE_DOT :
@@ -964,6 +983,8 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxGraphicsPe
if ( info.GetStyle() >= wxPENSTYLE_FIRST_HATCH
&& info.GetStyle() <= wxPENSTYLE_LAST_HATCH )
{
wxASSERT_MSG( info.GetColour().IsSolid(),
"Pen with non-solid colour is not supported." );
InitHatch(static_cast<wxHatchStyle>(info.GetStyle()));
}
break;