From 991004ed6ebfe0eabb3603214e1803be2a702822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 8 Oct 2018 13:45:38 +0200 Subject: [PATCH] [apps] VariableBoxController: truncate extension before displaying symbols --- apps/variable_box_controller.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp index 7f1e3dc0c..f4d571b8c 100644 --- a/apps/variable_box_controller.cpp +++ b/apps/variable_box_controller.cpp @@ -62,7 +62,9 @@ void VariableBoxController::willDisplayCellForIndex(HighlightCell * cell, int in } ExpressionTableCellWithExpression * myCell = (ExpressionTableCellWithExpression *)cell; Storage::Record record = recordAtIndex(index); - Layout symbolLayout = LayoutHelper::String(record.fullName(), strlen(record.fullName()) - strlen(extension())); + char truncatedName[SymbolAbstract::k_maxNameSize]; + size_t nameLength = SymbolAbstract::TruncateExtension(truncatedName, record.fullName(), SymbolAbstract::k_maxNameSize); + Layout symbolLayout = LayoutHelper::String(truncatedName, nameLength); myCell->setLayout(symbolLayout); myCell->setAccessoryLayout(expressionLayoutForIndex(selectedRow())); } @@ -114,7 +116,9 @@ bool VariableBoxController::returnToPreviousMenu() { bool VariableBoxController::selectLeaf(int selectedRow) { m_selectableTableView.deselectTable(); Storage::Record record = recordAtIndex(selectedRow); - sender()->handleEventWithText(record.fullName()); + char truncatedName[SymbolAbstract::k_maxNameSize]; + SymbolAbstract::TruncateExtension(truncatedName, record.fullName(), SymbolAbstract::k_maxNameSize); + sender()->handleEventWithText(truncatedName); app()->dismissModalViewController(); return true; }