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

Fix layout of drawing sample System colours screen for colors with non-opaque alpha

Browse Source
This commit is contained in:
Paul Cornett
2016-11-20 09:59:33 -08:00
parent 39bc670409
commit cb19499c90
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/drawing/drawing.cpp
View File

@@ -1578,7 +1578,13 @@ void MyCanvas::DrawGradients(wxDC& dc)
void MyCanvas::DrawSystemColours(wxDC& dc) void MyCanvas::DrawSystemColours(wxDC& dc)
{ {
wxSize textSize = dc.GetTextExtent("#WWWWgy"); wxFont mono(wxFontInfo().Family(wxFONTFAMILY_TELETYPE));
wxSize textSize;
{
wxDCFontChanger setMono(dc, mono);
textSize = dc.GetTextExtent(wxS("#01234567"));
}
int lineHeight = textSize.GetHeight(); int lineHeight = textSize.GetHeight();
wxRect r(textSize.GetWidth() + 10, 10, 100, lineHeight); wxRect r(textSize.GetWidth() + 10, 10, 100, lineHeight);
@@ -1621,8 +1627,6 @@ void MyCanvas::DrawSystemColours(wxDC& dc)
"wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT" "wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT"
}; };
wxFont mono(wxFontInfo().Family(wxFONTFAMILY_TELETYPE));
for (int i = 0; i < wxSYS_COLOUR_MAX; i++) for (int i = 0; i < wxSYS_COLOUR_MAX; i++)
{ {
wxSystemColour sysColour = (wxSystemColour)i; wxSystemColour sysColour = (wxSystemColour)i;
@@ -1641,7 +1645,7 @@ void MyCanvas::DrawSystemColours(wxDC& dc)
dc.DrawText(colourName, r.GetRight() + 10, r.y); dc.DrawText(colourName, r.GetRight() + 10, r.y);
r.y += lineHeight + 4; r.y += lineHeight;
} }
} }
@@ -1745,7 +1749,7 @@ void MyCanvas::Draw(wxDC& pdc)
gdc.SetGraphicsContext(context); gdc.SetGraphicsContext(context);
} }
wxDC &dc = m_renderer ? (wxDC&) gdc : (wxDC&) pdc ; wxDC &dc = m_renderer ? static_cast<wxDC&>(gdc) : pdc;
#else #else
wxDC &dc = pdc ; wxDC &dc = pdc ;
#endif #endif