UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/escher] Code layouting and typo

Browse Source
This commit is contained in:
Léa Saviot
2018-11-05 16:38:51 +01:00
committed by Émilie Feral
parent b9bf5be5f6
commit b3f5bf13de
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/variable_box_controller.cpp
View File

@@ -99,7 +99,10 @@ void VariableBoxController::willDisplayCellForIndex(HighlightCell * cell, int in
} else {
assert(m_currentPage == Page::Function);
StorageCartesianFunction f(record);
symbolLength = f.nameWithArgument(symbolName, Shared::StorageFunction::k_maxNameWithArgumentSize, Graph::StorageCartesianFunctionStore::Symbol());
symbolLength = f.nameWithArgument(
symbolName,
Shared::StorageFunction::k_maxNameWithArgumentSize,
Graph::StorageCartesianFunctionStore::Symbol());
}
Layout symbolLayout = LayoutHelper::String(symbolName, symbolLength);
myCell->setLayout(symbolLayout);

2
apps/variable_box_controller.h
View File

@@ -34,7 +34,7 @@ public:
};
void lockDeleteEvent(Page page);
private:
// TODO: use the "(x)" define in CartesianFunctionSomething
// TODO: use the "(x)" defined in CartesianFunctionSomething
constexpr static int k_functionArgLength = 3;
constexpr static const char * k_functionArg = "(x)";
constexpr static int k_maxNumberOfDisplayedRows = 6; //240/Metric::ToolboxRowHeight

2
escher/include/escher/expression_table_cell.h
View File

@@ -9,7 +9,7 @@ public:
ExpressionTableCell(Layout layout = Layout::Horizontal);
View * labelView() const override;
void setHighlighted(bool highlight) override;
void setLayout(Poincare::Layout layoutR);
void setLayout(Poincare::Layout layout);
Poincare::Layout layout() const override { return m_labelExpressionView.layout(); }
private:
ExpressionView m_labelExpressionView;

2
escher/include/escher/expression_table_cell_with_expression.h
View File

@@ -9,7 +9,7 @@ public:
ExpressionTableCellWithExpression();
View * accessoryView() const override;
void setHighlighted(bool highlight) override;
void setAccessoryLayout(Poincare::Layout layoutR);
void setAccessoryLayout(Poincare::Layout l);
private:
ExpressionView m_accessoryExpressionView;
};

4
escher/src/expression_table_cell.cpp
View File

@@ -18,7 +18,7 @@ void ExpressionTableCell::setHighlighted(bool highlight) {
m_labelExpressionView.setBackgroundColor(backgroundColor);
}
void ExpressionTableCell::setLayout(Poincare::Layout layoutR) {
m_labelExpressionView.setLayout(layoutR);
void ExpressionTableCell::setLayout(Poincare::Layout layout) {
m_labelExpressionView.setLayout(layout);
layoutSubviews();
}

4
escher/src/expression_table_cell_with_expression.cpp
View File

@@ -17,7 +17,7 @@ void ExpressionTableCellWithExpression::setHighlighted(bool highlight) {
m_accessoryExpressionView.setBackgroundColor(backgroundColor);
}
void ExpressionTableCellWithExpression::setAccessoryLayout(Poincare::Layout layoutR) {
m_accessoryExpressionView.setLayout(layoutR);
void ExpressionTableCellWithExpression::setAccessoryLayout(Poincare::Layout l) {
m_accessoryExpressionView.setLayout(l);
layoutSubviews();
}