Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-31 07:59:27 +02:00
Code Issues Releases Wiki Activity

Be more careful when handling grid keyboard navigation. (#589)

Browse Source 
If the grid is empty or does not have a selected cell, the current
row and column must still maintain these class invariants:
   -1 <= current_row < rows
   -1 <= current_column < columns
    if either current_row or current_column is -1, then the other
       shall also be -1

wxGrid uses wxGridNoCellCoords to test for current_row == -1 &&
current_column == -1.  We treat the case where only one
of the coordinates is -1 as if both are -1.
This commit is contained in:
Henric Jungheim 2020-06-29 08:34:50 -07:00 committed by GitHub
parent 7d2aad8c6a
commit 639a82a4a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/widgets/Grid.cpp
View File

@ -539,29 +539,39 @@ void Grid::OnKeyDown(wxKeyEvent &event)
{
int rows = GetNumberRows();
int cols = GetNumberCols();
int crow = GetGridCursorRow();
int ccol = GetGridCursorCol();
if (event.GetKeyCode() == WXK_LEFT) {
if (crow == 0 && ccol == 0) {
// do nothing
const bool has_cells = rows > 0 && cols > 0;
if (has_cells) {
int crow = GetGridCursorRow();
int ccol = GetGridCursorCol();
const bool has_no_selection = crow == wxGridNoCellCoords.GetRow() || ccol == wxGridNoCellCoords.GetCol();
if (has_no_selection) {
SetGridCursor(0, 0);
}
else if (ccol == 0) {
SetGridCursor(crow - 1, cols - 1);
else if (event.GetKeyCode() == WXK_LEFT) {
if (crow == 0 && ccol == 0) {
// do nothing
}
else if (ccol == 0) {
SetGridCursor(crow - 1, cols - 1);
}
else {
SetGridCursor(crow, ccol - 1);
}
}
else {
SetGridCursor(crow, ccol - 1);
}
}
else {
if (crow == rows - 1 && ccol == cols - 1) {
// do nothing
}
else if (ccol == cols - 1) {
SetGridCursor(crow + 1, 0);
}
else {
SetGridCursor(crow, ccol + 1);
if (crow == rows - 1 && ccol == cols - 1) {
// do nothing
}
else if (ccol == cols - 1) {
SetGridCursor(crow + 1, 0);
}
else {
SetGridCursor(crow, ccol + 1);
}
}
}
@ -574,11 +584,6 @@ void Grid::OnKeyDown(wxKeyEvent &event)
case WXK_TAB:
{
int rows = GetNumberRows();
int cols = GetNumberCols();
int crow = GetGridCursorRow();
int ccol = GetGridCursorCol();
if (event.ControlDown()) {
int flags = wxNavigationKeyEvent::FromTab |
( event.ShiftDown() ?
@ -587,9 +592,17 @@ void Grid::OnKeyDown(wxKeyEvent &event)
Navigate(flags);
return;
}
else if (event.ShiftDown()) {
// Empty grid?
if (crow == -1 && ccol == -1) {
int rows = GetNumberRows();
int cols = GetNumberCols();
int crow = GetGridCursorRow();
int ccol = GetGridCursorCol();
const auto is_empty = rows <= 0 || cols <= 0;
const auto has_no_selection = crow == wxGridNoCellCoords.GetRow() || ccol == wxGridNoCellCoords.GetCol();
if (event.ShiftDown()) {
if (is_empty) {
Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsBackward);
return;
}
@ -598,6 +611,10 @@ void Grid::OnKeyDown(wxKeyEvent &event)
Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsBackward);
return;
}
if (has_no_selection) {
SetGridCursor(rows -1, cols - 1);
}
else if (ccol == 0) {
SetGridCursor(crow - 1, cols - 1);
}
@ -606,8 +623,7 @@ void Grid::OnKeyDown(wxKeyEvent &event)
}
}
else {
// Empty grid?
if (crow == -1 && ccol == -1) {
if (is_empty) {
Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsForward);
return;
}
@ -616,6 +632,10 @@ void Grid::OnKeyDown(wxKeyEvent &event)
Navigate(wxNavigationKeyEvent::FromTab | wxNavigationKeyEvent::IsForward);
return;
}
if (has_no_selection) {
SetGridCursor(0, 0);
}
else if (ccol == cols - 1) {
SetGridCursor(crow + 1, 0);
}