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

Merge branch 'generic-dvc-multisel-fixes'

Browse Source 
Fix selection handling by Left/Right key handlers in generic
wxDataViewCtrl.

See https://github.com/wxWidgets/wxWidgets/pull/2207

Closes #19068.
This commit is contained in:
Vadim Zeitlin
2021-02-02 13:01:37 +01:00
parent a81f91114b bbd0c52440
commit 56017bfffb
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/generic/datavgen.cpp
View File

@@ -780,13 +780,26 @@ public:
void OnPaint( wxPaintEvent &event );
void OnCharHook( wxKeyEvent &event );
void OnChar( wxKeyEvent &event );
void OnVerticalNavigation(const wxKeyEvent& event, int delta);
void OnLeftKey(wxKeyEvent& event);
void OnRightKey(wxKeyEvent& event);
void OnMouse( wxMouseEvent &event );
void OnSetFocus( wxFocusEvent &event );
void OnKillFocus( wxFocusEvent &event );
// Go to the specified row, i.e. make it current and change or extend the
// selection extended depending on the modifier keys flags in the keyboard
// state.
//
// The row must be valid.
void GoToRow(const wxKeyboardState& state, unsigned int row);
// Go to the item at position delta rows away (delta may be positive or
// negative) from the current row.
//
// If adding delta would result in an invalid item, it's clamped to the
// valid items range.
void GoToRelativeRow(const wxKeyboardState& kbdState, int delta);
void UpdateDisplay();
void RecalculateDisplay();
void OnInternalIdle() wxOVERRIDE;
@@ -4609,11 +4622,11 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break;
case WXK_UP:
OnVerticalNavigation(event, -1);
GoToRelativeRow(event, -1);
break;
case WXK_DOWN:
OnVerticalNavigation(event, +1);
GoToRelativeRow(event, +1);
break;
case '+':
@@ -4645,19 +4658,19 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
break;
case WXK_END:
OnVerticalNavigation(event, +(int)GetRowCount());
GoToRelativeRow(event, +(int)GetRowCount());
break;
case WXK_HOME:
OnVerticalNavigation(event, -(int)GetRowCount());
GoToRelativeRow(event, -(int)GetRowCount());
break;
case WXK_PAGEUP:
OnVerticalNavigation(event, -(GetCountPerPage() - 1));
GoToRelativeRow(event, -(GetCountPerPage() - 1));
break;
case WXK_PAGEDOWN:
OnVerticalNavigation(event, +(GetCountPerPage() - 1));
GoToRelativeRow(event, +(GetCountPerPage() - 1));
break;
default:
@@ -4665,7 +4678,7 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
}
}
void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int delta)
void wxDataViewMainWindow::GoToRelativeRow(const wxKeyboardState& kbdState, int delta)
{
// if there is no selection, we cannot move it anywhere
if (!HasCurrentRow() || IsEmpty())
@@ -4681,15 +4694,21 @@ void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int del
if ( newRow >= rowCount )
newRow = rowCount - 1;
GoToRow(kbdState, newRow);
}
void
wxDataViewMainWindow::GoToRow(const wxKeyboardState& kbdState,
unsigned int newCurrent)
{
unsigned int oldCurrent = m_currentRow;
unsigned int newCurrent = (unsigned int)newRow;
if ( newCurrent == oldCurrent )
return;
// in single selection we just ignore Shift as we can't select several
// items anyhow
if ( event.ShiftDown() && !IsSingleSel() )
if ( kbdState.ShiftDown() && !IsSingleSel() )
{
RefreshRow( oldCurrent );
@@ -4714,12 +4733,12 @@ void wxDataViewMainWindow::OnVerticalNavigation(const wxKeyEvent& event, int del
RefreshRow( oldCurrent );
// all previously selected items are unselected unless ctrl is held
if ( !event.ControlDown() )
if ( !kbdState.ControlDown() )
UnselectAllRows();
ChangeCurrentRow( newCurrent );
if ( !event.ControlDown() )
if ( !kbdState.ControlDown() )
{
SelectRow( m_currentRow, true );
SendSelectionChangedEvent(GetItemByRow(m_currentRow));
@@ -4772,12 +4791,7 @@ void wxDataViewMainWindow::OnLeftKey(wxKeyEvent& event)
int parent = GetRowByItem( parent_node->GetItem() );
if ( parent >= 0 )
{
unsigned int row = m_currentRow;
SelectRow( row, false);
SelectRow( parent, true );
ChangeCurrentRow( parent );
GetOwner()->EnsureVisibleRowCol( parent, -1 );
SendSelectionChangedEvent( parent_node->GetItem() );
GoToRow(event, parent);
}
}
}
@@ -4805,12 +4819,7 @@ void wxDataViewMainWindow::OnRightKey(wxKeyEvent& event)
else
{
// if the node is already open, we move the selection to the first child
unsigned int row = m_currentRow;
SelectRow( row, false );
SelectRow( row + 1, true );
ChangeCurrentRow( row + 1 );
GetOwner()->EnsureVisibleRowCol( row + 1, -1 );
SendSelectionChangedEvent( GetItemByRow(row+1) );
GoToRelativeRow(event, +1);
}
}
else
@@ -4875,7 +4884,7 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxK
{
// go to the first column of the next row:
idx = 0;
OnVerticalNavigation(wxKeyEvent()/*dummy*/, +1);
GoToRelativeRow(wxKeyboardState()/*dummy*/, +1);
}
else
{
@@ -4893,7 +4902,7 @@ bool wxDataViewMainWindow::TryAdvanceCurrentColumn(wxDataViewTreeNode *node, wxK
{
// go to the last column of the previous row:
idx = (int)GetOwner()->GetColumnCount() - 1;
OnVerticalNavigation(wxKeyEvent()/*dummy*/, -1);
GoToRelativeRow(wxKeyboardState()/*dummy*/, -1);
}
else
{