From d3cae9d1aae0c9519a221c838fb810452dff996c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 28 Nov 2018 14:17:58 +0100 Subject: [PATCH] [apps/sequence] Harmonize row height in sequence list --- apps/sequence/list/list_controller.cpp | 5 +++-- apps/sequence/list/list_controller.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/sequence/list/list_controller.cpp b/apps/sequence/list/list_controller.cpp index 83e3c88b9..d73ddf45e 100644 --- a/apps/sequence/list/list_controller.cpp +++ b/apps/sequence/list/list_controller.cpp @@ -57,11 +57,12 @@ int ListController::numberOfExpressionRows() { }; KDCoordinate ListController::expressionRowHeight(int j) { + KDCoordinate defaultHeight = Metric::StoreRowHeight; if (m_sequenceStore->numberOfModels() < m_sequenceStore->maxNumberOfModels() && j == numberOfRows() - 1) { - return Metric::StoreRowHeight; + // Add sequence row + return defaultHeight; } Sequence * sequence = m_sequenceStore->modelAtIndex(modelIndexForRow(j)); - KDCoordinate defaultHeight = 2*k_expressionCellVerticalMargin + (sequence->type() == Sequence::Type::Explicit ? Metric::StoreRowHeight : k_emptySubRowHeight); Layout layout = sequence->layout(); if (sequenceDefinitionForRow(j) == 1) { layout = sequence->firstInitialConditionLayout(); diff --git a/apps/sequence/list/list_controller.h b/apps/sequence/list/list_controller.h index 0b8453a19..316dbc14a 100644 --- a/apps/sequence/list/list_controller.h +++ b/apps/sequence/list/list_controller.h @@ -44,7 +44,6 @@ private: void reinitExpression(Shared::ExpressionModel * model) override; void editExpression(Shared::ExpressionModel * model, Ion::Events::Event event) override; bool removeModelRow(Shared::ExpressionModel * model) override; - static constexpr KDCoordinate k_emptySubRowHeight = 30; constexpr static int k_maxNumberOfRows = 3*MaxNumberOfSequences; SequenceStore * m_sequenceStore; SequenceTitleCell m_sequenceTitleCells[k_maxNumberOfRows];