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

Use a single global StringFormat in all wxMSW wxGraphicsContext code.

Browse Source 
Instead of creating StringFormat in DrawText() and Get[Partial]TextExtent[s],
create it once and simply use it from both functions.

This might be slightly more efficient as we don't waste time recreating it but
the main advantage is that it ensures that these functions use the same string
format and no discrepancies between them are possible.

See #14537.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-09-09 00:43:18 +00:00
parent 6457b0bcc1
commit 122b3d0df3
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/msw/graphics.cpp
View File

@ -78,6 +78,31 @@ inline Color wxColourToColor(const wxColour& col)
return Color(col.Alpha(), col.Red(), col.Green(), col.Blue());
}
// Do not use this pointer directly, it's only used by
// GetDrawTextStringFormat() and the cleanup code in wxGDIPlusRendererModule.
StringFormat* gs_drawTextStringFormat = NULL;
// Get the string format used for the text drawing and measuring functions:
// notice that it must be the same one for all of them, otherwise the drawn
// text might be of different size than what measuring it returned.
inline StringFormat* GetDrawTextStringFormat()
{
if ( !gs_drawTextStringFormat )
{
gs_drawTextStringFormat = new StringFormat(StringFormat::GenericTypographic());
// This doesn't make any difference for DrawText() actually but we want
// this behaviour when measuring text.
gs_drawTextStringFormat->SetFormatFlags
(
gs_drawTextStringFormat->GetFormatFlags()
| StringFormatFlagsMeasureTrailingSpaces
);
}
return gs_drawTextStringFormat;
}
} // anonymous namespace
//-----------------------------------------------------------------------------
@ -1752,7 +1777,7 @@ void wxGDIPlusContext::DoDrawText(const wxString& str,
-1, // length: string is NUL-terminated
fontData->GetGDIPlusFont(),
PointF(x, y),
StringFormat::GenericTypographic(),
GetDrawTextStringFormat(),
fontData->GetGDIPlusBrush()
);
}
@ -1794,11 +1819,9 @@ void wxGDIPlusContext::GetTextExtent( const wxString &str, wxDouble *width, wxDo
else
{
RectF layoutRect(0,0, 100000.0f, 100000.0f);
StringFormat strFormat( StringFormat::GenericTypographic() );
strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
RectF bounds ;
m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, &strFormat, &bounds ) ;
m_context->MeasureString((const wchar_t *) s , wcslen(s) , f, layoutRect, GetDrawTextStringFormat(), &bounds ) ;
if ( width )
*width = bounds.Width;
if ( height )
@ -1822,7 +1845,7 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
wxASSERT_MSG(text.length() == len , wxT("GetPartialTextExtents not yet implemented for multichar situations"));
RectF layoutRect(0,0, 100000.0f, 100000.0f);
StringFormat strFormat( StringFormat::GenericTypographic() );
StringFormat strFormat( GetDrawTextStringFormat() );
size_t startPosition = 0;
size_t remainder = len;
@ -1840,7 +1863,6 @@ void wxGDIPlusContext::GetPartialTextExtents(const wxString& text, wxArrayDouble
ranges[i].Length = startPosition+i+1 ;
}
strFormat.SetMeasurableCharacterRanges(span,ranges);
strFormat.SetFormatFlags( StringFormatFlagsMeasureTrailingSpaces | strFormat.GetFormatFlags() );
m_context->MeasureCharacterRanges(ws, -1 , f,layoutRect, &strFormat,span,regions) ;
RectF bbox ;
@ -2255,7 +2277,12 @@ class wxGDIPlusRendererModule : public wxModule
{
public:
virtual bool OnInit() { return true; }
virtual void OnExit() { gs_GDIPlusRenderer.Unload(); }
virtual void OnExit()
{
wxDELETE(gs_drawTextStringFormat);
gs_GDIPlusRenderer.Unload();
}
private:
DECLARE_DYNAMIC_CLASS(wxGDIPlusRendererModule)