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

Don't make lines narrower that default line height in variable height mode, don't miss button press

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-05-20 12:44:21 +00:00
parent 7977b62ae2
commit 981cd83efc
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/generic/datavgen.cpp
View File

@@ -2953,7 +2953,7 @@ int wxDataViewMainWindow::GetLineStart( unsigned int row ) const
unsigned int cols = GetOwner()->GetColumnCount(); unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col; unsigned int col;
int height = 0; int height = m_lineHeight;
for (col = 0; col < cols; col++) for (col = 0; col < cols; col++)
{ {
const wxDataViewColumn *column = GetOwner()->GetColumn(col); const wxDataViewColumn *column = GetOwner()->GetColumn(col);
@@ -3005,7 +3005,7 @@ int wxDataViewMainWindow::GetLineAt( unsigned int y ) const
unsigned int cols = GetOwner()->GetColumnCount(); unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col; unsigned int col;
int height = 0; int height = m_lineHeight;
for (col = 0; col < cols; col++) for (col = 0; col < cols; col++)
{ {
const wxDataViewColumn *column = GetOwner()->GetColumn(col); const wxDataViewColumn *column = GetOwner()->GetColumn(col);
@@ -3052,7 +3052,7 @@ int wxDataViewMainWindow::GetLineHeight( unsigned int row ) const
wxDataViewItem item = node->GetItem(); wxDataViewItem item = node->GetItem();
int height = 0; int height = m_lineHeight;
unsigned int cols = GetOwner()->GetColumnCount(); unsigned int cols = GetOwner()->GetColumnCount();
unsigned int col; unsigned int col;
@@ -3722,7 +3722,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
wxRect rect( xpos + indent + EXPANDER_MARGIN, wxRect rect( xpos + indent + EXPANDER_MARGIN,
GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
m_lineHeight-2*EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,
m_lineHeight-2*EXPANDER_MARGIN); m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
if( rect.Contains( x, y) ) if( rect.Contains( x, y) )
{ {
//So the mouse is over the expander //So the mouse is over the expander
@@ -3850,7 +3850,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
wxRect rect( xpos + indent + EXPANDER_MARGIN, wxRect rect( xpos + indent + EXPANDER_MARGIN,
GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET, GetLineStart( current ) + EXPANDER_MARGIN + (GetLineHeight(current)/2) - (m_lineHeight/2) - EXPANDER_OFFSET,
m_lineHeight-2*EXPANDER_MARGIN, m_lineHeight-2*EXPANDER_MARGIN,
m_lineHeight-2*EXPANDER_MARGIN); m_lineHeight-2*EXPANDER_MARGIN + EXPANDER_OFFSET);
if( rect.Contains( x, y) ) if( rect.Contains( x, y) )
{ {