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

No more overlap between lines (I hope).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-04-09 10:06:21 +00:00
parent d701d432df
commit f0594f42be
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/treectrl.cpp
View File

@@ -1036,6 +1036,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
for(int i = 0; i < n ; i++)
{
m_imageListNormal->GetSize(i, width, height);
height += height/5; //20% extra spacing
if(height > m_lineHeight) m_lineHeight = height;
}
}
@@ -1110,7 +1111,9 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
}
int total_h = (image_h > text_h) ? image_h : text_h;
dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, total_h+4 );
if(m_lineHeight > total_h) total_h = m_lineHeight;
dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+2, total_h );
if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
{
@@ -1147,7 +1150,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
int horizX = level*m_indent;
item->SetX( horizX+33 );
item->SetY( y-m_lineHeight/3 );
item->SetY( y-m_lineHeight/2 );
item->SetHeight( m_lineHeight );
item->SetCross( horizX+15, y );
@@ -1521,7 +1524,7 @@ void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, i
int horizX = level*m_indent;
item->SetX( horizX+33 );
item->SetY( y-m_lineHeight/3-2 );
item->SetY( y-m_lineHeight/2 );
item->SetHeight( m_lineHeight );
if ( !item->IsExpanded() )