From 070af26558bdb7902572307cdc77d55186e73048 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 4 Oct 2013 07:57:26 +0000 Subject: [PATCH] Corrected border drawing to avoid clipping git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/richtext/richtextbuffer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp index 2b4cad1d68..cc4f3de5bc 100644 --- a/src/richtext/richtextbuffer.cpp +++ b/src/richtext/richtextbuffer.cpp @@ -743,8 +743,9 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe penStyle = wxLONG_DASH; wxPen pen(col, 1, penStyle); 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) { @@ -772,8 +773,8 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe penStyle = wxLONG_DASH; wxPen pen(col, 1, penStyle); 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) { @@ -781,7 +782,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe wxBrush brush(col); dc.SetPen(pen); 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; wxPen pen(col, 1, penStyle); 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) { @@ -838,7 +838,7 @@ bool wxRichTextObject::DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTe wxBrush brush(col); dc.SetPen(pen); 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); } } -- 2.45.2