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

Merge branch 'omega-dev-e14' of github.com:Omega-Numworks/Omega into omega-dev-e14

Browse Source
This commit is contained in:
Quentin Guidée
2020-07-17 23:52:16 +02:00
parent e37e59e4bc c31480c7cb
commit 6f8192cce2
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
poincare/src/layout_cursor.cpp
View File

@@ -125,17 +125,11 @@ void LayoutCursor::addLog() {
}
void LayoutCursor::addEmptyLog() {
HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder());
HorizontalLayout child2 = HorizontalLayout::Builder(EmptyLayout::Builder());
Layout logLayout = LayoutHelper::String("log", 3);
HorizontalLayout resultLayout = static_cast<HorizontalLayout &>(logLayout);
//VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript);
//resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
resultLayout.addChildAtIndex(HorizontalLayout::Builder(
LeftParenthesisLayout::Builder(),
child1,
RightParenthesisLayout::Builder()
), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
m_layout.addSibling(this, resultLayout, true);
@@ -143,17 +137,14 @@ void LayoutCursor::addEmptyLog() {
}
void LayoutCursor::addEmpty10Log() {
HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder());
HorizontalLayout child2 = HorizontalLayout::Builder(CodePointLayout::Builder('1'),CodePointLayout::Builder('0'));
HorizontalLayout child = HorizontalLayout::Builder(CodePointLayout::Builder('1'),CodePointLayout::Builder('0'));
Layout logLayout = LayoutHelper::String("log", 3);
HorizontalLayout resultLayout = static_cast<HorizontalLayout &>(logLayout);
VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript);
VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child, VerticalOffsetLayoutNode::Position::Subscript);
resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
resultLayout.addChildAtIndex(HorizontalLayout::Builder(
LeftParenthesisLayout::Builder(),
child1,
RightParenthesisLayout::Builder()
), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
m_layout.addSibling(this, resultLayout, true);
@@ -161,17 +152,14 @@ void LayoutCursor::addEmpty10Log() {
}
void LayoutCursor::addEmptyArgLog() {
HorizontalLayout child1 = HorizontalLayout::Builder(EmptyLayout::Builder());
HorizontalLayout child2 = HorizontalLayout::Builder(EmptyLayout::Builder());
HorizontalLayout child = HorizontalLayout::Builder(EmptyLayout::Builder());
Layout logLayout = LayoutHelper::String("log", 3);
HorizontalLayout resultLayout = static_cast<HorizontalLayout &>(logLayout);
VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child2, VerticalOffsetLayoutNode::Position::Subscript);
VerticalOffsetLayout offsetLayout = VerticalOffsetLayout::Builder(child, VerticalOffsetLayoutNode::Position::Subscript);
resultLayout.addChildAtIndex(offsetLayout, resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
resultLayout.addChildAtIndex(HorizontalLayout::Builder(
LeftParenthesisLayout::Builder(),
child1,
RightParenthesisLayout::Builder()
), resultLayout.numberOfChildren(), resultLayout.numberOfChildren(), nullptr);
m_layout.addSibling(this, resultLayout, true);