From b7a5abe597b155ace38958832796f6be7798e266 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 13 Jun 2020 00:03:01 +0200 Subject: [PATCH] [Feature] Add ALPHA to some shortcuts --- escher/src/nested_menu_controller.cpp | 2 +- escher/src/selectable_table_view.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp index 929c7b6c2..9e07091b8 100644 --- a/escher/src/nested_menu_controller.cpp +++ b/escher/src/nested_menu_controller.cpp @@ -140,7 +140,7 @@ bool NestedMenuController::handleEventForRow(Ion::Events::Event event, int rowIn if ((event == Ion::Events::Back || event == Ion::Events::Left) && depth > 0) { return returnToPreviousMenu(); } - if (event == Ion::Events::ShiftLeft && depth > 0) { + if ((event == Ion::Events::ShiftLeft || event == Ion::Events::AlphaLeft) && depth > 0) { for (int i = depth; i > 0; i--) { returnToPreviousMenu(); } diff --git a/escher/src/selectable_table_view.cpp b/escher/src/selectable_table_view.cpp index 3d359fcf5..b156885fe 100644 --- a/escher/src/selectable_table_view.cpp +++ b/escher/src/selectable_table_view.cpp @@ -128,25 +128,25 @@ bool SelectableTableView::handleEvent(Ion::Events::Event event) { if (event == Ion::Events::Down) { return selectCellAtLocation(selectedColumn(), selectedRow()+1); } - if (event == Ion::Events::ShiftDown && selectedRow() < dataSource()->numberOfRows()-1) { + if ((event == Ion::Events::ShiftDown || event == Ion::Events::AlphaDown) && selectedRow() < dataSource()->numberOfRows()-1) { return selectCellAtLocation(selectedColumn(), dataSource()->numberOfRows()-1); } if (event == Ion::Events::Up) { return selectCellAtLocation(selectedColumn(), selectedRow()-1); } - if (event == Ion::Events::ShiftUp && selectedRow() > 0) { + if ((event == Ion::Events::ShiftUp || event == Ion::Events::AlphaUp) && selectedRow() > 0) { return selectCellAtLocation(selectedColumn(), 0); } if (event == Ion::Events::Left) { return selectCellAtLocation(selectedColumn()-1, selectedRow()); } - if (event == Ion::Events::ShiftLeft && selectedColumn() > 0) { + if ((event == Ion::Events::ShiftLeft || event == Ion::Events::AlphaLeft) && selectedColumn() > 0) { return selectCellAtLocation(0, selectedRow()); } if (event == Ion::Events::Right) { return selectCellAtLocation(selectedColumn()+1, selectedRow()); } - if (event == Ion::Events::ShiftRight && selectedColumn() < dataSource()->numberOfColumns()-1) { + if ((event == Ion::Events::ShiftRight || event == Ion::Events::AlphaRight) && selectedColumn() < dataSource()->numberOfColumns()-1) { return selectCellAtLocation(dataSource()->numberOfColumns()-1, selectedRow()); } if (event == Ion::Events::Copy || event == Ion::Events::Cut) {