UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-20 01:08:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] VariableBoxController: fix expressionForIndex

Browse Source
This commit is contained in:
Émilie Feral
2018-10-08 14:00:04 +02:00
parent cfa3a0c0a6
commit 61d85f3e4a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/variable_box_controller.cpp
View File

@@ -66,12 +66,12 @@ void VariableBoxController::willDisplayCellForIndex(HighlightCell * cell, int in
size_t nameLength = SymbolAbstract::TruncateExtension(truncatedName, record.fullName(), SymbolAbstract::k_maxNameSize);
Layout symbolLayout = LayoutHelper::String(truncatedName, nameLength);
myCell->setLayout(symbolLayout);
myCell->setAccessoryLayout(expressionLayoutForIndex(selectedRow()));
myCell->setAccessoryLayout(expressionLayoutForRecord(record));
}
KDCoordinate VariableBoxController::rowHeight(int index) {
if (m_currentPage != Page::RootMenu) {
Layout layoutR = expressionLayoutForIndex(index);
Layout layoutR = expressionLayoutForRecord(recordAtIndex(index));
if (!layoutR.isUninitialized()) {
return max(layoutR.layoutSize().height()+k_leafMargin, Metric::ToolboxRowHeight);
}
@@ -129,9 +129,8 @@ I18n::Message VariableBoxController::nodeLabelAtIndex(int index) {
return labels[index];
}
Layout VariableBoxController::expressionLayoutForIndex(int index) {
Layout VariableBoxController::expressionLayoutForRecord(Storage::Record record) {
assert(m_currentPage != Page::RootMenu);
Storage::Record record = recordAtIndex(index);
return Expression::ExpressionFromRecord(record).createLayout(Poincare::Preferences::sharedPreferences()->displayMode(), Constant::ShortNumberOfSignificantDigits);
}