Support multiline strings in wxDC::DrawRotatedText() in wxMSW.

The native API doesn't support this, so do it by splitting the string into
lines manually.

Closes #9686.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-01-31 19:33:53 +00:00
parent 17a5323672
commit 0a86fd0f4f
4 changed files with 53 additions and 26 deletions

View File

@@ -40,3 +40,4 @@ wxMSW:
- Improve wxMimeTypesManager open command detection (Eric Jensen).
- Make wxFILTER_INCLUDE_LIST in wxTextValidator actually usable.
- Fix handling of selected images in wxBitmapButton (Artur Wieczorek).
- Support multiline strings in wxDC::DrawRotatedText() (Artur Wieczorek).

View File

@@ -542,6 +542,9 @@ public:
Draws the text rotated by @a angle degrees
(positive angles are counterclockwise; the full angle is 360 degrees).
Notice that, as with DrawText(), the @a text can contain multiple lines
separated by the new line (@c '\\n') characters.
@note Under Win9x only TrueType fonts can be drawn by this function. In
particular, a font different from @c wxNORMAL_FONT should be used
as the latter is not a TrueType font. @c wxSWISS_FONT is an

View File

@@ -827,6 +827,10 @@ void MyCanvas::DrawText(wxDC& dc)
y += height;
dc.DrawText("And\nmore\ntext on\nmultiple\nlines", 110, y);
y += 5*height;
dc.SetTextForeground(*wxBLUE);
dc.DrawRotatedText("Rotated text\ncan have\nmultiple lines\nas well", 110, y, 15);
}
static const struct

View File

@@ -1444,6 +1444,11 @@ void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
WXMICROWIN_CHECK_HDC
// prepare for drawing the text
wxTextColoursChanger textCol(GetHdc(), *this);
wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
DrawAnyText(text, x, y);
// update the bounding box
@@ -1456,13 +1461,6 @@ void wxMSWDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
void wxMSWDCImpl::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
{
WXMICROWIN_CHECK_HDC
// prepare for drawing the text
wxTextColoursChanger textCol(GetHdc(), *this);
wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
if ( ::ExtTextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), 0, NULL,
text.c_str(), text.length(), NULL) == 0 )
{
@@ -1483,6 +1481,8 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
if ( (angle == 0.0) && m_font.IsOk() )
{
DoDrawText(text, x, y);
// Bounding box already updated by DoDrawText(), no need to do it again.
}
#ifndef __WXMICROWIN__
else
@@ -1501,7 +1501,7 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
// GDI wants the angle in tenth of degree
long angle10 = (long)(angle * 10);
lf.lfEscapement = angle10;
lf. lfOrientation = angle10;
lf.lfOrientation = angle10;
hfont = ::CreateFontIndirect(&lf);
if ( !hfont )
@@ -1512,19 +1512,36 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
{
HFONT hfontOld = (HFONT)::SelectObject(GetHdc(), hfont);
DrawAnyText(text, x, y);
// Get extent of whole text.
wxCoord w, h, heightLine;
GetOwner()->GetMultiLineTextExtent(text, &w, &h, &heightLine);
// Prepare for drawing the text
wxTextColoursChanger textCol(GetHdc(), *this);
wxBkModeChanger bkMode(GetHdc(), m_backgroundMode);
// Compute the shift for the origin of the next line.
const double rad = DegToRad(angle);
const double dx = heightLine * sin(rad);
const double dy = heightLine * cos(rad);
// Draw all text line by line
const wxArrayString lines = wxSplit(text, '\n', '\0');
for ( size_t lineNum = 0; lineNum < lines.size(); lineNum++ )
{
// Calculate origin for each line to avoid accumulation of
// rounding errors.
DrawAnyText(lines[lineNum],
x + wxRound(lineNum*dx),
y + wxRound(lineNum*dy));
}
(void)::SelectObject(GetHdc(), hfontOld);
(void)::DeleteObject(hfont);
}
// call the bounding box by adding all four vertices of the rectangle
// containing the text to it (simpler and probably not slower than
// determining which of them is really topmost/leftmost/...)
wxCoord w, h;
GetOwner()->GetTextExtent(text, &w, &h);
double rad = DegToRad(angle);
// "upper left" and "upper right"
CalcBoundingBox(x, y);
@@ -1536,6 +1553,8 @@ void wxMSWDCImpl::DoDrawRotatedText(const wxString& text,
CalcBoundingBox(x, y);
CalcBoundingBox(x + wxCoord(w*cos(rad)), y - wxCoord(w*sin(rad)));
}
}
#endif
}