[apps/poincare] Replace CharLayouts with CodePointLayouts

This commit is contained in:
Léa Saviot
2019-01-11 14:09:45 +01:00
committed by Émilie Feral
parent 3f56cb7041
commit f576e31ff1
45 changed files with 238 additions and 421 deletions

View File

@@ -2,7 +2,7 @@
#include "../sequence_store.h"
#include <poincare/layout_helper.h>
#include <assert.h>
#include <poincare/char_layout.h>
#include <poincare/code_point_layout.h>
#include <poincare/vertical_offset_layout.h>
using namespace Poincare;
@@ -77,18 +77,18 @@ void SequenceToolbox::buildExtraCellsLayouts(const char * sequenceName, int recu
for (int j = 0; j < recurrenceDepth; j++) {
const char * indice = j == 0 ? "n" : "n+1";
m_addedCellLayout[j] = HorizontalLayout::Builder(
CharLayout::Builder(sequenceName[0], KDFont::LargeFont),
CodePointLayout::Builder(sequenceName[0], KDFont::LargeFont),
VerticalOffsetLayout::Builder(LayoutHelper::String(indice, strlen(indice), KDFont::LargeFont), VerticalOffsetLayoutNode::Type::Subscript)
);
m_addedCellLayout[j+recurrenceDepth] = HorizontalLayout::Builder(
CharLayout::Builder(otherSequenceName[0], KDFont::LargeFont),
CodePointLayout::Builder(otherSequenceName[0], KDFont::LargeFont),
VerticalOffsetLayout::Builder(LayoutHelper::String(indice, strlen(indice), KDFont::LargeFont), VerticalOffsetLayoutNode::Type::Subscript)
);
}
if (recurrenceDepth < 2) {
const char * indice = recurrenceDepth == 0 ? "n" : (recurrenceDepth == 1 ? "n+1" : "n+2");
m_addedCellLayout[2*recurrenceDepth] = HorizontalLayout::Builder(
CharLayout::Builder(otherSequenceName[0], KDFont::LargeFont),
CodePointLayout::Builder(otherSequenceName[0], KDFont::LargeFont),
VerticalOffsetLayout::Builder(LayoutHelper::String(indice, strlen(indice), KDFont::LargeFont), VerticalOffsetLayoutNode::Type::Subscript)
);
}