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

Extracted wxDataViewMainWindow left/right keys handling into separate methods.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2011-09-03 13:14:28 +00:00
parent 1dc779fc6c
commit cfc2188189
1 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
src/generic/datavgen.cpp
View File

@@ -547,6 +547,8 @@ public:
void OnPaint( wxPaintEvent &event ); void OnPaint( wxPaintEvent &event );
void OnChar( wxKeyEvent &event ); void OnChar( wxKeyEvent &event );
void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event); void OnVerticalNavigation(unsigned int newCurrent, const wxKeyEvent& event);
void OnLeftKey();
void OnRightKey();
void OnMouse( wxMouseEvent &event ); void OnMouse( wxMouseEvent &event );
void OnSetFocus( wxFocusEvent &event ); void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event ); void OnKillFocus( wxFocusEvent &event );
@@ -3334,53 +3336,13 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break; break;
// Add the process for tree expanding/collapsing // Add the process for tree expanding/collapsing
case WXK_LEFT: case WXK_LEFT:
{ OnLeftKey();
if (IsList())
break; break;
wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
if (!node)
break;
if (node->HasChildren() && node->IsOpen())
{
Collapse(m_currentRow);
}
else // if the node is already closed we move the selection to its parent
{
wxDataViewTreeNode *parent_node = node->GetParent();
if (parent_node)
{
int parent = GetRowByItem( parent_node->GetItem() );
if ( parent >= 0 )
{
unsigned int row = m_currentRow;
SelectRow( row, false);
SelectRow( parent, true );
ChangeCurrentRow( parent );
GetOwner()->EnsureVisible( parent, -1 );
SendSelectionChangedEvent( parent_node->GetItem() );
}
}
}
break;
}
case WXK_RIGHT: case WXK_RIGHT:
{ OnRightKey();
if (!IsExpanded( m_currentRow ))
Expand( m_currentRow );
else
{
unsigned int row = m_currentRow;
SelectRow( row, false );
SelectRow( row + 1, true );
ChangeCurrentRow( row + 1 );
GetOwner()->EnsureVisible( row + 1, -1 );
SendSelectionChangedEvent( GetItemByRow(row+1) );
}
break; break;
}
case WXK_END: case WXK_END:
{ {
if (!IsEmpty()) if (!IsEmpty())
@@ -3482,6 +3444,54 @@ void wxDataViewMainWindow::OnVerticalNavigation(unsigned int newCurrent, const w
GetOwner()->EnsureVisible( m_currentRow, -1 ); GetOwner()->EnsureVisible( m_currentRow, -1 );
} }
void wxDataViewMainWindow::OnLeftKey()
{
if (IsList())
return;
wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
if (!node)
return;
if (node->HasChildren() && node->IsOpen())
{
Collapse(m_currentRow);
}
else // if the node is already closed we move the selection to its parent
{
wxDataViewTreeNode *parent_node = node->GetParent();
if (parent_node)
{
int parent = GetRowByItem( parent_node->GetItem() );
if ( parent >= 0 )
{
unsigned int row = m_currentRow;
SelectRow( row, false);
SelectRow( parent, true );
ChangeCurrentRow( parent );
GetOwner()->EnsureVisible( parent, -1 );
SendSelectionChangedEvent( parent_node->GetItem() );
}
}
}
}
void wxDataViewMainWindow::OnRightKey()
{
if (!IsExpanded( m_currentRow ))
Expand( m_currentRow );
else
{
unsigned int row = m_currentRow;
SelectRow( row, false );
SelectRow( row + 1, true );
ChangeCurrentRow( row + 1 );
GetOwner()->EnsureVisible( row + 1, -1 );
SendSelectionChangedEvent( GetItemByRow(row+1) );
}
}
void wxDataViewMainWindow::OnMouse( wxMouseEvent &event ) void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
{ {
if (event.GetEventType() == wxEVT_MOUSEWHEEL) if (event.GetEventType() == wxEVT_MOUSEWHEEL)