Correct drawing placement (16px + 1 px border below)

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

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index 7c60861449094b3bee06e94f50774a16ec19e19e..814de1999a14f3573153bc496bf5a1aa24d4f882 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -2459,7 +2459,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
             wxSize size = cell->GetSize();
             // Because of the tree structure indent, here we should minus the width of the cell for drawing
             size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );

-            size.y = wxMin( size.y + 2*PADDING_TOPBOTTOM, cell_rect.height );
+            size.y = wxMin( size.y + 1*PADDING_TOPBOTTOM, cell_rect.height );

 
             wxRect item_rect(cell_rect.GetTopLeft(), size);
             int align = cell->GetAlignment();
 
             wxRect item_rect(cell_rect.GetTopLeft(), size);
             int align = cell->GetAlignment();


@@ -2482,9 +2482,9 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
             // add padding
             item_rect.x += PADDING_RIGHTLEFT;
 
             // add padding
             item_rect.x += PADDING_RIGHTLEFT;

-            item_rect.y += PADDING_TOPBOTTOM;
+            //item_rect.y += PADDING_TOPBOTTOM;

             item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
             item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;

-            item_rect.height = size.y - 2 * PADDING_TOPBOTTOM;
+            item_rect.height = size.y - 1 * PADDING_TOPBOTTOM;

 
             //Here we add the tree indent
             item_rect.x += indent;
 
             //Here we add the tree indent
             item_rect.x += indent;