Slightly improved keyboard navigation in variable editor

nyalldawson · nyalldawson · commit d0813410c13c · 2015-09-14T20:13:43.000+10:00
diff --git a/src/gui/qgsvariableeditorwidget.cpp b/src/gui/qgsvariableeditorwidget.cpp
@@ -585,6 +585,38 @@ void QgsVariableEditorTree::editNext( const QModelIndex& index )
   }
 }
 
+QModelIndex QgsVariableEditorTree::moveCursor( QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers )
+{
+  if ( cursorAction == QAbstractItemView::MoveNext )
+  {
+    QModelIndex index = currentIndex();
+    if ( index.isValid() )
+    {
+      if ( index.column() + 1 < model()->columnCount() )
+        return index.sibling( index.row(), index.column() + 1 );
+      else if ( index.row() + 1 < model()->rowCount( index.parent() ) )
+        return index.sibling( index.row() + 1, 0 );
+      else
+        return QModelIndex();
+    }
+  }
+  else if ( cursorAction == QAbstractItemView::MovePrevious )
+  {
+    QModelIndex index = currentIndex();
+    if ( index.isValid() )
+    {
+      if ( index.column() >= 1 )
+        return index.sibling( index.row(), index.column() - 1 );
+      else if ( index.row() >= 1 )
+        return index.sibling( index.row() - 1, model()->columnCount() - 1 );
+      else
+        return QModelIndex();
+    }
+  }
+
+  return QTreeWidget::moveCursor( cursorAction, modifiers );
+}
+
 void QgsVariableEditorTree::keyPressEvent( QKeyEvent *event )
 {
   switch ( event->key() )
diff --git a/src/gui/qgsvariableeditorwidget.h b/src/gui/qgsvariableeditorwidget.h
@@ -186,6 +186,8 @@ class QgsVariableEditorTree : public QTreeWidget
     void toggleContextExpanded( QTreeWidgetItem *item );
     void editNext( const QModelIndex &index );
 
+    QModelIndex moveCursor( CursorAction cursorAction, Qt::KeyboardModifiers modifiers ) override;
+
     static QIcon mExpandIcon;
 
   private:
