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

fixing possible offsetting glitches

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-10-21 11:52:54 +00:00
parent 0417955ddb
commit a06fe67b79
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/graphcmn.cpp
View File

@@ -579,12 +579,15 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush )
{ {
wxGraphicsBrush formerBrush = m_brush; wxGraphicsBrush formerBrush = m_brush;
wxGraphicsPen formerPen = m_pen;
wxDouble width; wxDouble width;
wxDouble height; wxDouble height;
wxDouble descent; wxDouble descent;
wxDouble externalLeading; wxDouble externalLeading;
GetTextExtent( str , &width, &height, &descent, &externalLeading ); GetTextExtent( str , &width, &height, &descent, &externalLeading );
SetBrush( backgroundBrush ); SetBrush( backgroundBrush );
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
SetPen( wxNullGraphicsPen );
wxGraphicsPath path = CreatePath(); wxGraphicsPath path = CreatePath();
path.AddRectangle( x , y, width, height ); path.AddRectangle( x , y, width, height );
@@ -592,11 +595,13 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, c
DrawText( str, x ,y); DrawText( str, x ,y);
SetBrush( formerBrush ); SetBrush( formerBrush );
SetPen( formerPen );
} }
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush ) void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
{ {
wxGraphicsBrush formerBrush = m_brush; wxGraphicsBrush formerBrush = m_brush;
wxGraphicsPen formerPen = m_pen;
wxDouble width; wxDouble width;
wxDouble height; wxDouble height;
@@ -604,6 +609,8 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
wxDouble externalLeading; wxDouble externalLeading;
GetTextExtent( str , &width, &height, &descent, &externalLeading ); GetTextExtent( str , &width, &height, &descent, &externalLeading );
SetBrush( backgroundBrush ); SetBrush( backgroundBrush );
// to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape
SetPen( wxNullGraphicsPen );
wxGraphicsPath path = CreatePath(); wxGraphicsPath path = CreatePath();
path.MoveToPoint( x , y ); path.MoveToPoint( x , y );
@@ -615,6 +622,7 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
FillPath( path ); FillPath( path );
DrawText( str, x ,y, angle); DrawText( str, x ,y, angle);
SetBrush( formerBrush ); SetBrush( formerBrush );
SetPen( formerPen );
} }
void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2) void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)