AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix calculating bounding box in wxPostScriptDC::DrawText and DrawRotatedText

Browse Source 
Calculate bounding box bearing in mind that drawn text can be a multi-line text.

Closes #17801.
This commit is contained in:
Artur Wieczorek 2017-02-19 10:18:52 +01:00
parent 7a88b05882
commit 37b7d0e594
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/dcpsg.cpp
View File

@ -1449,8 +1449,10 @@ void wxPostScriptDCImpl::DoDrawText( const wxString& text, wxCoord x, wxCoord y
DrawAnyText(textbuf, text_descent, size);
CalcBoundingBox( x, y );
CalcBoundingBox( x + size * text.length() * 2/3 , y );
wxCoord w, h;
GetOwner()->GetMultiLineTextExtent(text, &w, &h);
CalcBoundingBox(x, y);
CalcBoundingBox(x + w , y + h);
}
void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
@ -1492,8 +1494,16 @@ void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxC
buffer.Replace( ",", "." );
PsPrint( buffer );
CalcBoundingBox( x, y );
CalcBoundingBox( x + size * text.length() * 2/3 , y );
wxCoord w, h;
GetOwner()->GetMultiLineTextExtent(text, &w, &h);
// "upper left" and "upper right"
CalcBoundingBox(x, y);
CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));
// "bottom left" and "bottom right"
x += (wxCoord)(h*sin(rad));
y += (wxCoord)(h*cos(rad));
CalcBoundingBox(x, y);
CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));
}
void wxPostScriptDCImpl::SetBackground (const wxBrush& brush)