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

[apps/variable_box_controller] Fix memoization

Browse Source 
There was a broken assertion:
Create at least 7 functions
Go to the calculation app
Open the variable box and delete the last function
This commit is contained in:
Léa Saviot
2020-01-06 13:34:05 +01:00
committed by EmilieNumworks
parent f3c6aab669
commit fd63f70f6d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/variable_box_controller.cpp
View File

@@ -13,6 +13,7 @@ using namespace Shared;
using namespace Ion;
static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; }
static inline KDCoordinate maxInt(int x, int y) { return x > y ? x : y; }
VariableBoxController::VariableBoxController() :
NestedMenuController(nullptr, I18n::Message::Variables),
@@ -268,9 +269,12 @@ void VariableBoxController::resetMemoization() {
void VariableBoxController::destroyRecordAtRowIndex(int rowIndex) {
// Destroy the record
recordAtIndex(rowIndex).destroy();
// Shift the memoization
assert(rowIndex >= m_firstMemoizedLayoutIndex && rowIndex < m_firstMemoizedLayoutIndex + k_maxNumberOfDisplayedRows);
for (int i = rowIndex - m_firstMemoizedLayoutIndex; i < k_maxNumberOfDisplayedRows - 1; i++) {
// Shift the memoization if needed
if (rowIndex >= m_firstMemoizedLayoutIndex + k_maxNumberOfDisplayedRows) {
// The deleted row is after the memoization
return;
}
for (int i = maxInt(0, rowIndex - m_firstMemoizedLayoutIndex); i < k_maxNumberOfDisplayedRows - 1; i++) {
m_layouts[i] = m_layouts[i+1];
}
m_layouts[k_maxNumberOfDisplayedRows - 1] = Layout();