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

adding text with background brush

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2006-11-04 17:41:41 +00:00
parent 5dfc7e56e5
commit 068eb463a4
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/graphics.h
View File

@ -494,6 +494,10 @@ public:
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle );
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) ;
virtual void DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush );
virtual void GetTextExtent( const wxString &text, wxDouble *width, wxDouble *height,
wxDouble *descent, wxDouble *externalLeading ) const = 0;

10
src/common/dcgraph.cpp
View File

@ -762,7 +762,10 @@ void wxGCDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
if ( m_logicalFunction != wxCOPY )
return;
m_graphicContext->DrawText( str, x ,y , DegToRad(angle ));
if ( m_backgroundMode == wxTRANSPARENT )
m_graphicContext->DrawText( str, x ,y , DegToRad(angle ));
else
m_graphicContext->DrawText( str, x ,y , DegToRad(angle ), m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
}
void wxGCDC::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
@ -774,7 +777,10 @@ void wxGCDC::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
if ( m_logicalFunction != wxCOPY )
return;
m_graphicContext->DrawText( str, x ,y);
if ( m_backgroundMode == wxTRANSPARENT )
m_graphicContext->DrawText( str, x ,y);
else
m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
}
bool wxGCDC::CanGetTextExtent() const

41
src/common/graphcmn.cpp
View File

@ -558,6 +558,47 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w
Translate(-x,-y);
}
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush )
{
wxGraphicsBrush formerBrush = m_brush;
wxDouble width;
wxDouble height;
wxDouble descent;
wxDouble externalLeading;
GetTextExtent( str , &width, &height, &descent, &externalLeading );
SetBrush( backgroundBrush );
wxGraphicsPath path = CreatePath();
path.AddRectangle( x , y, width, height );
FillPath( path );
DrawText( str, x ,y);
SetBrush( formerBrush );
}
void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush )
{
wxGraphicsBrush formerBrush = m_brush;
wxDouble width;
wxDouble height;
wxDouble descent;
wxDouble externalLeading;
GetTextExtent( str , &width, &height, &descent, &externalLeading );
SetBrush( backgroundBrush );
wxGraphicsPath path = CreatePath();
path.MoveToPoint( x , y );
path.AddLineToPoint( (int) (x + sin(angle) * height) , (int) (y + cos(angle) * height) );
path.AddLineToPoint(
(int) (x + sin(angle) * height + cos(angle) * width) ,
(int) (y + cos(angle) * height - sin(angle) * width));
path.AddLineToPoint((int) (x + cos(angle) * width) , (int) (y - sin(angle) * width) );
FillPath( path );
DrawText( str, x ,y, angle);
SetBrush( formerBrush );
}
void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2)
{
wxGraphicsPath path = CreatePath();