ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2758 from Edgars-Cirulis/improvements/instanceview-navigation

Browse Source 
Improve left and right cursor navigation in Instances
This commit is contained in:
Alexandru Ionut Tripon 2024-08-26 23:55:03 +03:00 committed by GitHub
commit 685519d12f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
launcher/ui/instanceview/InstanceView.cpp
View File

@ -848,7 +848,7 @@ QRegion InstanceView::visualRegionForSelection(const QItemSelection& selection)
return region; return region;
} }
QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, [[maybe_unused]] Qt::KeyboardModifiers modifiers) QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
{ {
auto current = currentIndex(); auto current = currentIndex();
if (!current.isValid()) { if (!current.isValid()) {
@ -865,6 +865,7 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
if (m_currentCursorColumn < 0) { if (m_currentCursorColumn < 0) {
m_currentCursorColumn = column; m_currentCursorColumn = column;
} }
// Handle different movement actions.
switch (cursorAction) { switch (cursorAction) {
case MoveUp: { case MoveUp: {
if (row == 0) { if (row == 0) {
@ -925,16 +926,47 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
if (column > 0) { if (column > 0) {
m_currentCursorColumn = column - 1; m_currentCursorColumn = column - 1;
return cat->rows[row][column - 1]; return cat->rows[row][column - 1];
} else if (row > 0) {
row -= 1;
int newRowSize = cat->rows[row].size();
m_currentCursorColumn = newRowSize - 1;
return cat->rows[row][m_currentCursorColumn];
} else {
int prevGroupIndex = group_index - 1;
while (prevGroupIndex >= 0) {
auto prevGroup = m_groups[prevGroupIndex];
if (prevGroup->collapsed) {
prevGroupIndex--;
continue;
}
int lastRow = prevGroup->numRows() - 1;
int lastCol = prevGroup->rows[lastRow].size() - 1;
m_currentCursorColumn = lastCol;
return prevGroup->rows[lastRow][lastCol];
}
} }
// TODO: moving to previous line
return current; return current;
} }
case MoveRight: { case MoveRight: {
if (column < cat->rows[row].size() - 1) { if (column < cat->rows[row].size() - 1) {
m_currentCursorColumn = column + 1; m_currentCursorColumn = column + 1;
return cat->rows[row][column + 1]; return cat->rows[row][column + 1];
} else if (row < cat->rows.size() - 1) {
row += 1;
m_currentCursorColumn = 0;
return cat->rows[row][m_currentCursorColumn];
} else {
int nextGroupIndex = group_index + 1;
while (nextGroupIndex < m_groups.size()) {
auto nextGroup = m_groups[nextGroupIndex];
if (nextGroup->collapsed) {
nextGroupIndex++;
continue;
}
m_currentCursorColumn = 0;
return nextGroup->rows[0][0];
}
} }
// TODO: moving to next line
return current; return current;
} }
case MoveHome: { case MoveHome: {
@ -947,6 +979,7 @@ QModelIndex InstanceView::moveCursor(QAbstractItemView::CursorAction cursorActio
return cat->rows[row][last]; return cat->rows[row][last];
} }
default: default:
// For unsupported cursor actions, return the current index.
break; break;
} }
return current; return current;