From e6f77c43826b02c7fcd042e6907d867bd6992eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Fri, 10 Aug 2018 11:11:03 +0200 Subject: [PATCH] [poincare] BracketPairLayoutNode and BracketLayoutNode --- poincare/Makefile | 2 ++ poincare/src/bracket_pair_layout_node.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/poincare/Makefile b/poincare/Makefile index fba2016f7..d6d5f5109 100644 --- a/poincare/Makefile +++ b/poincare/Makefile @@ -5,6 +5,8 @@ SFLAGS += -Ipoincare/include objs += $(addprefix poincare/src/,\ absolute_value_layout_node.o\ binomial_coefficient_layout_node.o\ + bracket_layout_node.o\ + bracket_pair_layout_node.o\ addition.o\ arithmetic.o\ expression_lexer.o\ diff --git a/poincare/src/bracket_pair_layout_node.cpp b/poincare/src/bracket_pair_layout_node.cpp index 161bf178f..a70bff263 100644 --- a/poincare/src/bracket_pair_layout_node.cpp +++ b/poincare/src/bracket_pair_layout_node.cpp @@ -76,14 +76,14 @@ void BracketPairLayoutNode::deleteBeforeCursor(LayoutCursor * cursor) { LayoutRef rootRef = LayoutRef(root()); LayoutRef thisRef = LayoutRef(this); LayoutRef child = childLayout(); - replaceChildWithGhostInPlace(child); + thisRef.replaceChildWithGhostInPlace(child); // WARNING: do not call "this" afterwards if (rootRef.isAllocationFailure()) { cursor->setLayoutReference(rootRef); return; } cursor->setLayoutReference(thisRef.childAtIndex(0)); - cursor->setPosition(LayoutNode::Position::Left); + cursor->setPosition(LayoutCursor::Position::Left); thisRef.replaceWith(child, cursor); return; }