From: Robin Dunn <robin@alldunn.com>
Date: Wed, 11 Sep 2002 18:36:55 +0000 (+0000)
Subject: Fixed some off-by-one and other issues with drawing the HRULE/VRULE
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e7d073c3762034afea87cfc8849f03c53a3c0ace

Fixed some off-by-one and other issues with drawing the HRULE/VRULE
lines.  Made the VRULEs line up with the column header splitter
lines.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index b85060db7f..911612205e 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2816,7 +2816,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxPen pen(GetRuleColour(), 1, wxSOLID);
             wxSize clientSize = GetClientSize();
 
-            for ( size_t i = visibleFrom; i <= visibleTo; i++ )
+            // Don't draw the first one
+            for ( size_t i = visibleFrom+1; i <= visibleTo; i++ )
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
@@ -2825,12 +2826,12 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             }
 
             // Draw last horizontal rule
-            if ( visibleTo > visibleFrom )
+            if ( visibleTo == GetItemCount() - 1 )
             {
                 dc.SetPen(pen);
                 dc.SetBrush( *wxTRANSPARENT_BRUSH );
-                dc.DrawLine(0 - dev_x, m_lineTo*lineHeight,
-                            clientSize.x - dev_x , m_lineTo*lineHeight );
+                dc.DrawLine(0 - dev_x, (m_lineTo+1)*lineHeight,
+                            clientSize.x - dev_x , (m_lineTo+1)*lineHeight );
             }
         }
 
@@ -2842,8 +2843,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             int col = 0;
             wxRect firstItemRect;
             wxRect lastItemRect;
-            GetItemRect(0, firstItemRect);
-            GetItemRect(GetItemCount() - 1, lastItemRect);
+            GetItemRect(visibleFrom, firstItemRect);
+            GetItemRect(visibleTo, lastItemRect);
             int x = firstItemRect.GetX();
             dc.SetPen(pen);
             dc.SetBrush(* wxTRANSPARENT_BRUSH);
@@ -2851,8 +2852,8 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth;
-                dc.DrawLine(x - dev_x, firstItemRect.GetY() - 1 - dev_y,
-                            x - dev_x, lastItemRect.GetBottom() + 1 - dev_y);
+                dc.DrawLine(x - dev_x - 2, firstItemRect.GetY() - 1 - dev_y,
+                            x - dev_x - 2, lastItemRect.GetBottom() + 1 - dev_y);
             }
         }
     }
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index b57021fd00..524a9413f4 100644
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -2212,7 +2212,7 @@ void wxListCtrl::OnPaint(wxPaintEvent& event)
             {
                 int colWidth = GetColumnWidth(col);
                 x += colWidth ;
-                dc.DrawLine(x, firstItemRect.GetY() - 2, x, itemRect.GetBottom());
+                dc.DrawLine(x-1, firstItemRect.GetY() - 2, x-1, itemRect.GetBottom());
             }
         }
     }