From cab22fcbcebae14e0322c3b66f14ecfc95361d60 Mon Sep 17 00:00:00 2001 From: Hugo Saint-Vignes Date: Wed, 21 Oct 2020 15:04:04 +0200 Subject: [PATCH] [apps/shared] Set buttonAction method as protected Change-Id: Iaef80fdbb6083be688fadc2b5fc515dbbd0d004c --- apps/shared/float_parameter_controller.h | 2 +- apps/shared/range_parameter_controller.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/shared/float_parameter_controller.h b/apps/shared/float_parameter_controller.h index 21dc7f94b..0d7f2495e 100644 --- a/apps/shared/float_parameter_controller.h +++ b/apps/shared/float_parameter_controller.h @@ -38,11 +38,11 @@ protected: int activeCell(); StackViewController * stackController(); virtual T parameterAtIndex(int index) = 0; + virtual void buttonAction(); SelectableTableView m_selectableTableView; ButtonWithSeparator m_okButton; private: constexpr static int k_buttonMargin = 6; - virtual void buttonAction(); virtual InfinityTolerance infinityAllowanceForRow(int row) const { return InfinityTolerance::None; } virtual int reusableParameterCellCount(int type) = 0; virtual HighlightCell * reusableParameterCell(int index, int type) = 0; diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp index 2e2712ed2..38d00d365 100644 --- a/apps/shared/range_parameter_controller.cpp +++ b/apps/shared/range_parameter_controller.cpp @@ -88,8 +88,7 @@ void RangeParameterController::buttonAction() { m_interactiveRange->setZoomAuto(false); m_interactiveRange->setZoomNormalize(m_interactiveRange->isOrthonormal()); - StackViewController * stack = stackController(); - stack->pop(); + FloatParameterController::buttonAction(); } }