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

[poincare] GridLayoutNode keep track of its number of children

Browse Source 
Before, the number of children was only computed with the number of rows
and columns, but we might need to know the real number of added children
during construction.
This commit is contained in:
Léa Saviot
2018-07-25 16:57:31 +02:00
parent fd490e9d9b
commit aebc8d3330
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
poincare/include/poincare/grid_layout_node.h
View File

@@ -17,12 +17,14 @@ class GridLayoutNode : public LayoutNode {
public:
GridLayoutNode() :
LayoutNode(),
m_numberOfChildren(0),
m_numberOfRows(0),
m_numberOfColumns(0)
{}
void setNumberOfRows(int numberOfRows) { m_numberOfRows = numberOfRows; }
void setNumberOfColumns(int numberOfColumns) { m_numberOfColumns = numberOfColumns; }
KDSize gridSize() const { return KDSize(width(), height()); }
// LayoutNode
void moveCursorLeft(LayoutCursor * cursor, bool * shouldRecomputeLayout) override;
@@ -38,8 +40,20 @@ public:
// TreeNode
size_t size() const override { return sizeof(GridLayoutNode); }
int numberOfChildren() const override { return m_numberOfRows * m_numberOfColumns; }
int numberOfChildren() const override { return m_numberOfChildren; }
void incrementNumberOfChildren(int increment = 1) override {
assert(increment >= 0);
m_numberOfChildren += increment;
}
void decrementNumberOfChildren(int decrement = 1) override {
m_numberOfChildren -= decrement;
if (m_numberOfChildren < 0) {
m_numberOfChildren = 0;
}
}
void eraseNumberOfChildren() override {
m_numberOfChildren = 0;
m_numberOfRows = 0;
m_numberOfColumns = 0;
}
@@ -62,6 +76,7 @@ protected:
int rowAtChildIndex(int index) const;
int columnAtChildIndex(int index) const;
int indexAtRowColumn(int rowIndex, int columnIndex) const;
int m_numberOfChildren;
int m_numberOfRows;
int m_numberOfColumns;

2
poincare/src/grid_layout_node.cpp
View File

@@ -162,7 +162,7 @@ int GridLayoutNode::indexAtRowColumn(int rowIndex, int columnIndex) const {
}
void GridLayoutNode::computeSize() {
m_frame.setSize(KDSize(width(), height()));
m_frame.setSize(gridSize());
m_sized = true;
}