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

Corrected border drawing to avoid clipping

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2013-10-04 07:57:26 +00:00
parent fc8a2ec1f6
commit 070af26558
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/richtext/richtextbuffer.cpp
View File

@@ -743,8 +743,9 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe
penStyle = wxLONG_DASH; penStyle = wxLONG_DASH;
wxPen pen(col, 1, penStyle); wxPen pen(col, 1, penStyle);
dc.SetPen(pen); dc.SetPen(pen);
dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
// Note that the last point is not drawn.
dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
} }
else if (borderLeft > 1) else if (borderLeft > 1)
{ {
@@ -772,8 +773,8 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe
penStyle = wxLONG_DASH; penStyle = wxLONG_DASH;
wxPen pen(col, 1, penStyle); wxPen pen(col, 1, penStyle);
dc.SetPen(pen); dc.SetPen(pen);
dc.DrawLine(rect.x + rect.width, rect.y, rect.x + rect.width, rect.y + rect.height + 1); // Note that the last point is not drawn.
dc.DrawLine(rect.x + rect.width - 1, rect.y, rect.x + rect.width - 1, rect.y + rect.height);
} }
else if (borderRight > 1) else if (borderRight > 1)
{ {
@@ -781,7 +782,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe
wxBrush brush(col); wxBrush brush(col);
dc.SetPen(pen); dc.SetPen(pen);
dc.SetBrush(brush); dc.SetBrush(brush);
dc.DrawRectangle(rect.x + rect.width - borderRight, rect.y, borderRight, rect.height + 1); dc.DrawRectangle(rect.x + rect.width - borderRight, rect.y, borderRight, rect.height);
} }
} }
@@ -829,8 +830,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe
penStyle = wxLONG_DASH; penStyle = wxLONG_DASH;
wxPen pen(col, 1, penStyle); wxPen pen(col, 1, penStyle);
dc.SetPen(pen); dc.SetPen(pen);
dc.DrawLine(rect.x, rect.y + rect.height, rect.x + rect.width, rect.y + rect.height); dc.DrawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1);
} }
else if (borderBottom > 1) else if (borderBottom > 1)
{ {
@@ -838,7 +838,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe
wxBrush brush(col); wxBrush brush(col);
dc.SetPen(pen); dc.SetPen(pen);
dc.SetBrush(brush); dc.SetBrush(brush);
dc.DrawRectangle(rect.x, rect.y + rect.height - borderBottom + 1, rect.width, borderBottom); dc.DrawRectangle(rect.x, rect.y + rect.height - borderBottom, rect.width, borderBottom);
} }
} }