From 10df4064795b1bc318a88cf775d963fc1b7226be Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 Oct 2013 22:28:29 +0000 Subject: [PATCH] Revert changes to the drawing of the tree item buttons in the generic renderer. This reverts r74887 as this created problems when drawing them at standard size. See #15526. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/renderg.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 4d411dd12d..93354ab404 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -467,20 +467,12 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), dc.DrawRectangle(rect); - // Make sure that the sign is properly centered by always using an - // odd-sized rectangle for it. - wxRect signRect(rect); - if ( !(signRect.x % 2) ) - signRect.x--; - if ( !(signRect.y % 2) ) - signRect.y--; - // black lines - const wxCoord xMiddle = signRect.x + signRect.width/2; - const wxCoord yMiddle = signRect.y + signRect.height/2; + const wxCoord xMiddle = rect.x + rect.width/2; + const wxCoord yMiddle = rect.y + rect.height/2; // half of the length of the horz lines in "-" and "+" - const wxCoord halfWidth = signRect.width/2 - 2; + const wxCoord halfWidth = rect.width/2 - 2; dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xMiddle - halfWidth, yMiddle, xMiddle + halfWidth + 1, yMiddle); @@ -488,7 +480,7 @@ wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win), if ( !(flags & wxCONTROL_EXPANDED) ) { // turn "-" into "+" - const wxCoord halfHeight = signRect.height/2 - 2; + const wxCoord halfHeight = rect.height/2 - 2; dc.DrawLine(xMiddle, yMiddle - halfHeight, xMiddle, yMiddle + halfHeight + 1); }