From 47cf7d3f355bcd3d7be4bd8f16e8aa8ddce189a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 25 Apr 2018 18:00:28 +0200 Subject: [PATCH] [poincare] Fix missing return statement Change-Id: I56aa9bff457d150efc7c451d57155c9e0db8cec4 --- poincare/src/expression_layout_cursor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/poincare/src/expression_layout_cursor.cpp b/poincare/src/expression_layout_cursor.cpp index f19716714..5495c1623 100644 --- a/poincare/src/expression_layout_cursor.cpp +++ b/poincare/src/expression_layout_cursor.cpp @@ -267,14 +267,16 @@ KDCoordinate ExpressionLayoutCursor::pointedLayoutHeight() { ExpressionLayout * equivalentPointedLayout = m_pointedExpressionLayout->equivalentCursor(this).pointedExpressionLayout(); if (m_pointedExpressionLayout->hasChild(equivalentPointedLayout)) { return equivalentPointedLayout->size().height(); - } else if (m_pointedExpressionLayout->hasSibling(equivalentPointedLayout)) { - KDCoordinate pointedLayoutHeight = m_pointedExpressionLayout->size().height(); + } + KDCoordinate pointedLayoutHeight = m_pointedExpressionLayout->size().height(); + if (m_pointedExpressionLayout->hasSibling(equivalentPointedLayout)) { KDCoordinate equivalentLayoutHeight = equivalentPointedLayout->size().height(); KDCoordinate pointedLayoutBaseline = m_pointedExpressionLayout->baseline(); KDCoordinate equivalentLayoutBaseline = equivalentPointedLayout->baseline(); return max(pointedLayoutBaseline, equivalentLayoutBaseline) + max(pointedLayoutHeight - pointedLayoutBaseline, equivalentLayoutHeight - equivalentLayoutBaseline); } + return pointedLayoutHeight; } }