UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 09:10:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] LayoutCursor methods that take/return nodes are private

Browse Source
This commit is contained in:
Léa Saviot
2018-09-20 11:11:33 +02:00
parent fd56d936c7
commit 369b333692
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
poincare/include/poincare/layout_cursor.h
View File

@@ -10,7 +10,20 @@ class VerticalOffsetLayout;
class LayoutCursor {
friend class Layout;
friend class BinomialCoefficientLayoutNode;
friend class BracketLayoutNode;
friend class BracketPairLayoutNode;
friend class ConjugateLayoutNode;
friend class EmptyLayoutNode;
friend class FractionLayoutNode;
friend class GridLayoutNode;
friend class HorizontalLayoutNode;
friend class IntegralLayoutNode;
friend class LayoutNode;
friend class MatrixLayoutNode;
friend class NthRootLayoutNode;
friend class SequenceLayoutNode;
friend class VerticalOffsetLayoutNode;
public:
constexpr static KDCoordinate k_cursorWidth = 1;
@@ -36,11 +49,6 @@ public:
m_position(position)
{}
LayoutCursor(LayoutNode * node, Position position = Position::Right) :
m_layout(node),
m_position(position)
{} //TODO make this private and friend class layout_node
LayoutCursor clone() const {
return LayoutCursor(m_layout, m_position);
}
@@ -50,7 +58,6 @@ public:
// Getters and setters
Layout layouterence() { return m_layout; }
LayoutNode * layoutNode() { return m_layout.node(); } // TODO Make private + friend classes ?
int layoutIdentifier() { return m_layout.identifier(); }
void setLayout(Layout r) {
@@ -58,15 +65,6 @@ public:
m_layout = r;
}
}
void setLayoutNode(LayoutNode * n) {
if (n->identifier() != m_layout.identifier()) {
/* Compare the identifiers and not the nodes because m_layout might
* temporarily be pointing to a GhostNode. In this case,
* m_layout.node() would crash because of the assertion that the node
* is not ghost. */
m_layout = Layout(n);
}
}
void setTo(LayoutCursor * other) {
m_layout = other->layouterence();
m_position = other->position();
@@ -121,6 +119,20 @@ public:
private:
constexpr static KDCoordinate k_cursorHeight = 18;
LayoutCursor(LayoutNode * node, Position position = Position::Right) :
m_layout(node),
m_position(position)
{}
LayoutNode * layoutNode() { return m_layout.node(); }
void setLayoutNode(LayoutNode * n) {
if (n->identifier() != m_layout.identifier()) {
/* Compare the identifiers and not the nodes because m_layout might
* temporarily be pointing to a GhostNode. In this case,
* m_layout.node() would crash because of the assertion that the node
* is not ghost. */
m_layout = Layout(n);
}
}
KDCoordinate layoutHeight();
void privateAddEmptyPowerLayout(VerticalOffsetLayout v);
bool baseForNewPowerLayout();