From 8cb2b9925437506c84408ee15442b3f1deda252d Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 3 May 2019 16:08:59 +0200 Subject: [PATCH] [apps/graph/calculation_graph_controller] Remove handleLeftRightEvent --- apps/graph/graph/calculation_graph_controller.cpp | 10 +++------- apps/graph/graph/calculation_graph_controller.h | 1 - 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/apps/graph/graph/calculation_graph_controller.cpp b/apps/graph/graph/calculation_graph_controller.cpp index 43622b255..0adcfc2d3 100644 --- a/apps/graph/graph/calculation_graph_controller.cpp +++ b/apps/graph/graph/calculation_graph_controller.cpp @@ -57,13 +57,6 @@ ContinuousFunctionStore * CalculationGraphController::functionStore() const { return App::app()->functionStore(); } -bool CalculationGraphController::handleLeftRightEvent(Ion::Events::Event event) { - if (!m_isActive) { - return false; - } - return SimpleInteractiveCurveViewController::handleLeftRightEvent(event); -} - bool CalculationGraphController::handleEnter() { StackViewController * stack = static_cast(parentResponder()); stack->pop(); @@ -71,6 +64,9 @@ bool CalculationGraphController::handleEnter() { } bool CalculationGraphController::moveCursorHorizontally(int direction, bool fast) { + if (!m_isActive) { + return false; + } Coordinate2D newPointOfInterest = computeNewPointOfInterestFromAbscissa(m_cursor->x(), direction); if (std::isnan(newPointOfInterest.x1())) { return false; diff --git a/apps/graph/graph/calculation_graph_controller.h b/apps/graph/graph/calculation_graph_controller.h index 1586bd149..46f861ddf 100644 --- a/apps/graph/graph/calculation_graph_controller.h +++ b/apps/graph/graph/calculation_graph_controller.h @@ -31,7 +31,6 @@ protected: bool m_isActive; private: bool handleZoom(Ion::Events::Event event) override { return false; } - bool handleLeftRightEvent(Ion::Events::Event event) override; bool handleEnter() override; bool moveCursorHorizontally(int direction, bool fast = false) override; Shared::InteractiveCurveViewRange * interactiveCurveViewRange() override { return m_graphRange; }