From 4e0e285501fff0168f0de260dca101eb518a31e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Wed, 10 May 2017 12:04:30 +0200
Subject: [PATCH] [apps][escher] EXE and OK trigger the same behaviour

Change-Id: Ide7d38fbc445be717e50ed46f2d784c02c9830e4
---
 apps/graph/graph/curve_parameter_controller.cpp         | 2 +-
 apps/graph/list/list_controller.cpp                     | 2 +-
 apps/graph/values/derivative_parameter_controller.cpp   | 2 +-
 apps/graph/values/function_parameter_controller.cpp     | 2 +-
 apps/graph/values/values_controller.cpp                 | 2 +-
 apps/home/controller.cpp                                | 2 +-
 apps/math_toolbox.cpp                                   | 2 +-
 apps/probability/calculation_controller.cpp             | 2 +-
 apps/probability/image_table_view.cpp                   | 2 +-
 apps/probability/law_controller.cpp                     | 2 +-
 apps/regression/initialisation_parameter_controller.cpp | 2 +-
 apps/regression/prediction_parameter_controller.cpp     | 2 +-
 apps/sequence/graph/curve_parameter_controller.cpp      | 2 +-
 apps/sequence/graph/term_sum_controller.cpp             | 4 ++--
 apps/sequence/list/list_controller.cpp                  | 2 +-
 apps/sequence/list/list_parameter_controller.cpp        | 2 +-
 apps/sequence/list/sequence_toolbox.cpp                 | 2 +-
 apps/sequence/list/type_parameter_controller.cpp        | 2 +-
 apps/settings/main_controller.cpp                       | 2 +-
 apps/settings/sub_controller.cpp                        | 2 +-
 apps/shared/initialisation_parameter_controller.cpp     | 2 +-
 apps/shared/interactive_curve_view_controller.cpp       | 2 +-
 apps/shared/list_controller.cpp                         | 4 ++--
 apps/shared/list_parameter_controller.cpp               | 2 +-
 apps/shared/range_parameter_controller.cpp              | 2 +-
 apps/shared/store_controller.cpp                        | 2 +-
 apps/shared/store_parameter_controller.cpp              | 2 +-
 apps/shared/values_controller.cpp                       | 2 +-
 apps/shared/values_parameter_controller.cpp             | 2 +-
 apps/variable_box_controller.cpp                        | 2 +-
 escher/src/button.cpp                                   | 2 +-
 escher/src/button_row_controller.cpp                    | 2 +-
 escher/src/tab_view_controller.cpp                      | 2 +-
 escher/src/text_field.cpp                               | 2 +-
 34 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp
index 255b3d27c..b98686e85 100644
--- a/apps/graph/graph/curve_parameter_controller.cpp
+++ b/apps/graph/graph/curve_parameter_controller.cpp
@@ -26,7 +26,7 @@ void CurveParameterController::willDisplayCellForIndex(HighlightCell * cell, int
 }
 
 bool CurveParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
         return true;
diff --git a/apps/graph/list/list_controller.cpp b/apps/graph/list/list_controller.cpp
index 24c627ef2..8ba1a94b6 100644
--- a/apps/graph/list/list_controller.cpp
+++ b/apps/graph/list/list_controller.cpp
@@ -41,7 +41,7 @@ KDCoordinate ListController::rowHeight(int j) {
 void ListController::editExpression(Function * function, Ion::Events::Event event) {
   char * initialText = nullptr;
   char initialTextContent[TextField::maxBufferSize()];
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     strlcpy(initialTextContent, function->text(), sizeof(initialTextContent));
     initialText = initialTextContent;
   }
diff --git a/apps/graph/values/derivative_parameter_controller.cpp b/apps/graph/values/derivative_parameter_controller.cpp
index ba3c82972..b29aa8f20 100644
--- a/apps/graph/values/derivative_parameter_controller.cpp
+++ b/apps/graph/values/derivative_parameter_controller.cpp
@@ -42,7 +42,7 @@ void DerivativeParameterController::didBecomeFirstResponder() {
 }
 
 bool DerivativeParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
       {
diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp
index 40dba9696..8fe4e5da3 100644
--- a/apps/graph/values/function_parameter_controller.cpp
+++ b/apps/graph/values/function_parameter_controller.cpp
@@ -20,7 +20,7 @@ void FunctionParameterController::setFunction(Function * function) {
 }
 
 bool FunctionParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
       {
diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp
index 762744331..94169b709 100644
--- a/apps/graph/values/values_controller.cpp
+++ b/apps/graph/values/values_controller.cpp
@@ -19,7 +19,7 @@ ValuesController::ValuesController(Responder * parentResponder, CartesianFunctio
 }
 
 bool ValuesController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK && selectedRow() == 0
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && selectedRow() == 0
       && selectedColumn()>0 && isDerivativeColumn(selectedColumn())) {
     configureDerivativeFunction();
     return true;
diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp
index 73e06cfb8..f59de86fe 100644
--- a/apps/home/controller.cpp
+++ b/apps/home/controller.cpp
@@ -46,7 +46,7 @@ Controller::Controller(Responder * parentResponder, ::AppsContainer * container)
 }
 
 bool Controller::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_container->switchTo(m_container->appAtIndex(selectedRow()*k_numberOfColumns+selectedColumn()+1));
     return true;
   }
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
index 94f465ae4..a00e0baf6 100644
--- a/apps/math_toolbox.cpp
+++ b/apps/math_toolbox.cpp
@@ -239,7 +239,7 @@ bool MathToolbox::handleEventForRow(Ion::Events::Event event, int selectedRow) {
   if (event == Ion::Events::Back) {
     return returnToPreviousMenu();
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     ToolboxNode * selectedNode = (ToolboxNode *)m_nodeModel->children(selectedRow);
     if (selectedNode->numberOfChildren() == 0) {
       return selectLeaf(selectedNode);
diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp
index 4a121f623..deffd982b 100644
--- a/apps/probability/calculation_controller.cpp
+++ b/apps/probability/calculation_controller.cpp
@@ -210,7 +210,7 @@ bool CalculationController::handleEvent(Ion::Events::Event event) {
     }
     return true;
   }
-  if (event == Ion::Events::OK && m_highlightedSubviewIndex == 0) {
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && m_highlightedSubviewIndex == 0) {
     m_contentView.imageTableView()->select(true);
     app()->setFirstResponder(m_contentView.imageTableView());
     return true;
diff --git a/apps/probability/image_table_view.cpp b/apps/probability/image_table_view.cpp
index 048147768..a86695b0e 100644
--- a/apps/probability/image_table_view.cpp
+++ b/apps/probability/image_table_view.cpp
@@ -85,7 +85,7 @@ void ImageTableView::willExitResponderChain(Responder * nextFirstResponder) {
 }
 
 bool ImageTableView::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_calculationController->setCalculationAccordingToIndex(selectedRow());
     select(false);
     setHighlight(true);
diff --git a/apps/probability/law_controller.cpp b/apps/probability/law_controller.cpp
index 56c6ca5b4..220f0b596 100644
--- a/apps/probability/law_controller.cpp
+++ b/apps/probability/law_controller.cpp
@@ -87,7 +87,7 @@ void Probability::LawController::didBecomeFirstResponder() {
 }
 
 bool Probability::LawController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     StackViewController * stack = (StackViewController *)parentResponder();
     setLawAccordingToIndex(selectedRow());
     stack->push(&m_parametersController, KDColorWhite, Palette::PurpleBright, Palette::PurpleBright);
diff --git a/apps/regression/initialisation_parameter_controller.cpp b/apps/regression/initialisation_parameter_controller.cpp
index 985501e2a..07a8c9569 100644
--- a/apps/regression/initialisation_parameter_controller.cpp
+++ b/apps/regression/initialisation_parameter_controller.cpp
@@ -28,7 +28,7 @@ void InitialisationParameterController::didBecomeFirstResponder() {
 }
 
 bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {&InteractiveCurveViewRange::roundAbscissa,
       &InteractiveCurveViewRange::normalize, &InteractiveCurveViewRange::setDefault};
     (m_store->*rangeMethods[selectedRow()])();
diff --git a/apps/regression/prediction_parameter_controller.cpp b/apps/regression/prediction_parameter_controller.cpp
index cf0c2d6ef..0da9afbb1 100644
--- a/apps/regression/prediction_parameter_controller.cpp
+++ b/apps/regression/prediction_parameter_controller.cpp
@@ -27,7 +27,7 @@ void PredictionParameterController::didBecomeFirstResponder() {
 }
 
 bool PredictionParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_goToParameterController.setXPrediction(selectedRow() == 0);
     StackViewController * stack = (StackViewController *)parentResponder();
     stack->push(&m_goToParameterController);
diff --git a/apps/sequence/graph/curve_parameter_controller.cpp b/apps/sequence/graph/curve_parameter_controller.cpp
index 21f660ff3..88a5f7a7c 100644
--- a/apps/sequence/graph/curve_parameter_controller.cpp
+++ b/apps/sequence/graph/curve_parameter_controller.cpp
@@ -19,7 +19,7 @@ const char * CurveParameterController::title() {
 }
 
 bool CurveParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
       {
diff --git a/apps/sequence/graph/term_sum_controller.cpp b/apps/sequence/graph/term_sum_controller.cpp
index 3b73d6cfe..155300687 100644
--- a/apps/sequence/graph/term_sum_controller.cpp
+++ b/apps/sequence/graph/term_sum_controller.cpp
@@ -56,7 +56,7 @@ void TermSumController::viewWillAppear() {
 }
 
 bool TermSumController::handleEvent(Ion::Events::Event event) {
-  if (m_step > 1 && event != Ion::Events::OK && event != Ion::Events::Back) {
+  if (m_step > 1 && event != Ion::Events::OK && event != Ion::Events::EXE && event != Ion::Events::Back) {
     return false;
   }
   if (event == Ion::Events::Left) {
@@ -87,7 +87,7 @@ bool TermSumController::handleEvent(Ion::Events::Event event) {
     }
     return false;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     if (m_step == 2) {
       StackViewController * stack = (StackViewController *)parentResponder();
       stack->pop();
diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp
index e442660ba..131c77468 100644
--- a/apps/sequence/list/list_controller.cpp
+++ b/apps/sequence/list/list_controller.cpp
@@ -85,7 +85,7 @@ void ListController::selectPreviousNewSequenceCell() {
 void ListController::editExpression(Sequence * sequence, int sequenceDefinition, Ion::Events::Event event) {
   char * initialText = nullptr;
   char initialTextContent[TextField::maxBufferSize()];
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (sequenceDefinition) {
       case 0:
         strlcpy(initialTextContent, sequence->text(), sizeof(initialTextContent));
diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp
index 19dc40987..621762263 100644
--- a/apps/sequence/list/list_parameter_controller.cpp
+++ b/apps/sequence/list/list_parameter_controller.cpp
@@ -24,7 +24,7 @@ void ListParameterController::setFunction(Shared::Function * function) {
 }
 
 bool ListParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     int selectedRowIndex = selectedRow();
     switch (selectedRowIndex) {
 #if FUNCTION_COLOR_CHOICE
diff --git a/apps/sequence/list/sequence_toolbox.cpp b/apps/sequence/list/sequence_toolbox.cpp
index ef4dacbb3..a75d8bd92 100644
--- a/apps/sequence/list/sequence_toolbox.cpp
+++ b/apps/sequence/list/sequence_toolbox.cpp
@@ -24,7 +24,7 @@ SequenceToolbox::~SequenceToolbox() {
 }
 
 bool SequenceToolbox::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK && stackDepth() == 0) {
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && stackDepth() == 0) {
     if (selectedRow() < m_numberOfAddedCells) {
       return selectAddedCell(selectedRow());
     }
diff --git a/apps/sequence/list/type_parameter_controller.cpp b/apps/sequence/list/type_parameter_controller.cpp
index d4751f4b9..1db643a0d 100644
--- a/apps/sequence/list/type_parameter_controller.cpp
+++ b/apps/sequence/list/type_parameter_controller.cpp
@@ -49,7 +49,7 @@ void TypeParameterController::didBecomeFirstResponder() {
 }
 
 bool TypeParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     if (m_sequence) {
       Sequence::Type sequenceType = (Sequence::Type)selectedRow();
       if (m_sequence->type() != sequenceType) {
diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp
index bf730cb8d..bc782ba8f 100644
--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -55,7 +55,7 @@ void MainController::didBecomeFirstResponder() {
 }
 
 bool MainController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_subController.setNodeModel(m_nodeModel->children(selectedRow()), selectedRow());
     StackViewController * stack = stackController();
     stack->push(&m_subController);
diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp
index d71a64103..89277bc31 100644
--- a/apps/settings/sub_controller.cpp
+++ b/apps/settings/sub_controller.cpp
@@ -64,7 +64,7 @@ bool SubController::handleEvent(Ion::Events::Event event) {
     appsContainer->switchTo(appsContainer->hardwareTestApp());
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     /* Behavious of "Exam mode" menu*/
     if (m_preferenceIndex == 4) {
       if (GlobalPreferences::sharedGlobalPreferences()->examMode() == GlobalPreferences::ExamMode::Activate) {
diff --git a/apps/shared/initialisation_parameter_controller.cpp b/apps/shared/initialisation_parameter_controller.cpp
index 4f76c2953..6b6551053 100644
--- a/apps/shared/initialisation_parameter_controller.cpp
+++ b/apps/shared/initialisation_parameter_controller.cpp
@@ -26,7 +26,7 @@ void InitialisationParameterController::didBecomeFirstResponder() {
 }
 
 bool InitialisationParameterController::handleEvent(Ion::Events::Event event) {
-if (event == Ion::Events::OK) {
+if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     RangeMethodPointer rangeMethods[k_totalNumberOfCells] = {&InteractiveCurveViewRange::setTrigonometric,
     &InteractiveCurveViewRange::roundAbscissa, &InteractiveCurveViewRange::normalize, &InteractiveCurveViewRange::setDefault};
     (m_graphRange->*rangeMethods[selectedRow()])();
diff --git a/apps/shared/interactive_curve_view_controller.cpp b/apps/shared/interactive_curve_view_controller.cpp
index aaa230cf7..2d275e203 100644
--- a/apps/shared/interactive_curve_view_controller.cpp
+++ b/apps/shared/interactive_curve_view_controller.cpp
@@ -94,7 +94,7 @@ bool InteractiveCurveViewController::handleEvent(Ion::Events::Event event) {
     header()->setSelectedButton(0);
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     return handleEnter();
   }
   return false;
diff --git a/apps/shared/list_controller.cpp b/apps/shared/list_controller.cpp
index a2bb03226..4aa13bf03 100644
--- a/apps/shared/list_controller.cpp
+++ b/apps/shared/list_controller.cpp
@@ -177,7 +177,7 @@ bool ListController::handleEvent(Ion::Events::Event event) {
     footer()->setSelectedButton(0);
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
       switch (selectedColumn()) {
       case 0:
       {
@@ -196,7 +196,7 @@ bool ListController::handleEvent(Ion::Events::Event event) {
           return true;
         }
         Shared::Function * function = m_functionStore->functionAtIndex(functionIndexForRow(selectedRow()));
-        editExpression(function, Ion::Events::OK);
+        editExpression(function, event);
         return true;
       }
       default:
diff --git a/apps/shared/list_parameter_controller.cpp b/apps/shared/list_parameter_controller.cpp
index 60b3c7f07..37146ae68 100644
--- a/apps/shared/list_parameter_controller.cpp
+++ b/apps/shared/list_parameter_controller.cpp
@@ -47,7 +47,7 @@ void ListParameterController::setFunction(Function * function) {
 }
 
 bool ListParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     return handleEnterOnRow(selectedRow());
   }
   return false;
diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp
index 563b80d9e..fcd7398bb 100644
--- a/apps/shared/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -84,7 +84,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
 }
 
 bool RangeParameterController::handleEvent(Ion::Events::Event event) {
-  if (activeCell() == 2 && event == Ion::Events::OK) {
+  if (activeCell() == 2 && (event == Ion::Events::OK || event == Ion::Events::EXE)) {
     m_interactiveRange->setYAuto(!m_interactiveRange->yAuto());
     selectableTableView()->reloadData();
     return true;
diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp
index 404f7709c..7cb3ed70a 100644
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -80,7 +80,7 @@ bool StoreController::handleEvent(Ion::Events::Event event) {
     app()->setFirstResponder(tabController());
     return true;
   }
-  if (event == Ion::Events::OK && selectedRow() == 0) {
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && selectedRow() == 0) {
     m_storeParameterController.selectXColumn(selectedColumn() == 0);
     StackViewController * stack = ((StackViewController *)parentResponder()->parentResponder());
     stack->push(&m_storeParameterController);
diff --git a/apps/shared/store_parameter_controller.cpp b/apps/shared/store_parameter_controller.cpp
index d5cc5da17..d622b8dcc 100644
--- a/apps/shared/store_parameter_controller.cpp
+++ b/apps/shared/store_parameter_controller.cpp
@@ -35,7 +35,7 @@ void StoreParameterController::didBecomeFirstResponder() {
 }
 
 bool StoreParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
       {
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index b1986e074..43b27ab83 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -60,7 +60,7 @@ bool ValuesController::handleEvent(Ion::Events::Event event) {
     selectableTableView()->reloadData();
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     if (selectedRow() == -1) {
       return header()->handleEvent(event);
     }
diff --git a/apps/shared/values_parameter_controller.cpp b/apps/shared/values_parameter_controller.cpp
index a4ab1d613..74803139b 100644
--- a/apps/shared/values_parameter_controller.cpp
+++ b/apps/shared/values_parameter_controller.cpp
@@ -41,7 +41,7 @@ void ValuesParameterController::didBecomeFirstResponder() {
 }
 
 bool ValuesParameterController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     switch (selectedRow()) {
       case 0:
       {
diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp
index 549a9ccbd..33095e96a 100644
--- a/apps/variable_box_controller.cpp
+++ b/apps/variable_box_controller.cpp
@@ -48,7 +48,7 @@ bool VariableBoxController::ContentViewController::handleEvent(Ion::Events::Even
     app()->setFirstResponder(this);
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_selectableTableView.deselectTable();
     if (m_currentPage == Page::RootMenu) {
       m_previousSelectedRow = selectedRow();
diff --git a/escher/src/button.cpp b/escher/src/button.cpp
index 278e11b5c..c1db0162f 100644
--- a/escher/src/button.cpp
+++ b/escher/src/button.cpp
@@ -24,7 +24,7 @@ void Button::layoutSubviews() {
 }
 
 bool Button::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     m_invocation.perform(this);
     return true;
   }
diff --git a/escher/src/button_row_controller.cpp b/escher/src/button_row_controller.cpp
index 2491a3327..3045d22ae 100644
--- a/escher/src/button_row_controller.cpp
+++ b/escher/src/button_row_controller.cpp
@@ -215,7 +215,7 @@ bool ButtonRowController::handleEvent(Ion::Events::Event event) {
     }
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     return true;
   }
   return false;
diff --git a/escher/src/tab_view_controller.cpp b/escher/src/tab_view_controller.cpp
index 1868f6658..4df33fb37 100644
--- a/escher/src/tab_view_controller.cpp
+++ b/escher/src/tab_view_controller.cpp
@@ -102,7 +102,7 @@ bool TabViewController::handleEvent(Ion::Events::Event event) {
     setActiveTab(m_activeChildIndex, false);
     return true;
   }
-  if (event == Ion::Events::OK) {
+  if (event == Ion::Events::OK || event == Ion::Events::EXE) {
     setActiveTab(m_selectedChildIndex, true);
     return true;
   }
diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index 19acf9d4d..9c294490a 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -312,7 +312,7 @@ bool TextField::handleEvent(Ion::Events::Event event) {
     setCursorLocation(cursorLoc);
     return true;
   }
-  if (event == Ion::Events::OK && !isEditing()) {
+  if ((event == Ion::Events::OK || event == Ion::Events::EXE) && !isEditing()) {
     setEditing(true);
     /* If the text could not be inserted (buffer is full), we set the cursor
      * at the end of the text. */