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

Fix background colour used by DrawEllipse() in wxQt

Browse Source 
wxDC::DrawEllipse() used to use the text background for filling the
ellipses drawn with transparent pen, for some reason. According to
f9b28cd4325f42936d3122bfe7c847354bbbfee9 which changed this (this commit
was part of df13791078 merge done with
svn), this was done for compatibility with wxGTK, but wxGTK definitely
doesn't do it now and apparently never did, so there must have been some
mistake.

Simply remove the extra code using the text background for consistency
with this method behaviour in the other ports and also other methods
behaviour in the same port.

Closes https://github.com/wxWidgets/wxWidgets/pull/1087
This commit is contained in:
Jay Nabonne
2018-12-19 09:05:29 +00:00
committed by Vadim Zeitlin
parent c47c7de5ea
commit c6d3b9c0b9
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/qt/dc.cpp
View File

@@ -577,29 +577,13 @@ void wxQtDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
void wxQtDCImpl::DoDrawEllipse(wxCoord x, wxCoord y,
wxCoord width, wxCoord height)
{
QBrush savedBrush;
int penWidth = m_qtPainter->pen().width();
const int penWidth = m_qtPainter->pen().width();
x += penWidth / 2;
y += penWidth / 2;
width -= penWidth;
height -= penWidth;
if ( m_pen.IsNonTransparent() )
{
// Save pen/brush
savedBrush = m_qtPainter->brush();
// Fill with text background color ("no fill" like in wxGTK):
m_qtPainter->setBrush(QBrush(m_textBackgroundColour.GetQColor()));
}
// Draw
m_qtPainter->drawEllipse( x, y, width, height );
if ( m_pen.IsNonTransparent() )
{
//Restore saved settings
m_qtPainter->setBrush(savedBrush);
}
}
void wxQtDCImpl::DoCrossHair(wxCoord x, wxCoord y)