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

More alignment issues

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-10-17 09:17:32 +00:00
parent 69357fa0cb
commit e2da67f6d7
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/datavgen.cpp
View File

@@ -56,9 +56,6 @@ static const int SCROLL_UNIT_X = 15;
// the cell padding on the left/right
static const int PADDING_RIGHTLEFT = 3;
// the cell padding on the top/bottom
static const int PADDING_TOPBOTTOM = 1;
// the expander space margin
static const int EXPANDER_MARGIN = 4;
@@ -1908,7 +1905,6 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
#else
20;
#endif
wxASSERT(m_lineHeight > 2*PADDING_TOPBOTTOM);
m_dragCount = 0;
m_dragStart = wxPoint(0,0);
@@ -2460,7 +2456,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 );
size.y = wxMin( size.y + 1*PADDING_TOPBOTTOM, cell_rect.height );
size.y = wxMin( size.y, cell_rect.height );
wxRect item_rect(cell_rect.GetTopLeft(), size);
int align = cell->GetAlignment();
@@ -2483,9 +2479,7 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
// add padding
item_rect.x += PADDING_RIGHTLEFT;
//item_rect.y += PADDING_TOPBOTTOM;
item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
item_rect.height = size.y - 1 * PADDING_TOPBOTTOM;
//Here we add the tree indent
item_rect.x += indent;