From 0a9edf8a434ee3e40084e4051a82fefc306eff31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 28 Nov 2018 14:20:06 +0100 Subject: [PATCH] [apps/sequence] Add cheat margin between sequence title and equal --- apps/sequence/sequence.cpp | 14 ++++++++------ apps/sequence/sequence.h | 1 + 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/sequence/sequence.cpp b/apps/sequence/sequence.cpp index 675e9bad9..6f47aac39 100644 --- a/apps/sequence/sequence.cpp +++ b/apps/sequence/sequence.cpp @@ -196,11 +196,12 @@ Poincare::Layout Sequence::firstInitialConditionName() { && (m_type == Type::SingleRecurrence || m_type == Type::DoubleRecurrence)) { - Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), KDFont::LargeFont); + Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), k_layoutFont); m_firstInitialConditionName = HorizontalLayout( - CharLayout(name()[0], KDFont::LargeFont), + CharLayout(name()[0], k_layoutFont), VerticalOffsetLayout(indexLayout, VerticalOffsetLayoutNode::Type::Subscript), - CharLayout('=', KDFont::LargeFont) + CharLayout(' ', KDFont::SmallFont), // Cheat margin + CharLayout('=', k_layoutFont) ); } return m_firstInitialConditionName; @@ -211,11 +212,12 @@ Poincare::Layout Sequence::secondInitialConditionName() { Integer(m_initialRank+1).serialize(buffer, k_initialRankNumberOfDigits+1); if (m_secondInitialConditionName.isUninitialized()) { if (m_type == Type::DoubleRecurrence) { - Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), KDFont::LargeFont); + Layout indexLayout = LayoutHelper::String(buffer, strlen(buffer), k_layoutFont); m_secondInitialConditionName = HorizontalLayout( - CharLayout(name()[0], KDFont::LargeFont), + CharLayout(name()[0], k_layoutFont), VerticalOffsetLayout(indexLayout, VerticalOffsetLayoutNode::Type::Subscript), - CharLayout('=', KDFont::LargeFont) + CharLayout(' ', KDFont::SmallFont), // Cheat margin + CharLayout('=', k_layoutFont) ); } } diff --git a/apps/sequence/sequence.h b/apps/sequence/sequence.h index 7e2f9aefb..c99072854 100644 --- a/apps/sequence/sequence.h +++ b/apps/sequence/sequence.h @@ -52,6 +52,7 @@ public: void tidy() override; constexpr static int k_initialRankNumberOfDigits = 3; // m_initialRank is capped by 999 private: + constexpr static const KDFont * k_layoutFont = KDFont::LargeFont; constexpr static double k_maxNumberOfTermsInSum = 100000.0; constexpr static size_t k_dataLengthInBytes = (3*TextField::maxBufferSize()+3)*sizeof(char)+sizeof(int)+1; static_assert((k_dataLengthInBytes & 0x3) == 0, "The sequence data size is not a multiple of 4 bytes (cannot compute crc)"); // Assert that dataLengthInBytes is a multiple of 4