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

Fixed some conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
parent d057d66949 7123c7c098
commit ab8f731515
687 changed files with 13048 additions and 4057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/variable_box_empty_controller.cpp
View File

@@ -28,6 +28,10 @@ void VariableBoxEmptyController::VariableBoxEmptyView::setLayout(Poincare::Layou
m_layoutExample.setLayout(layout);
}
void VariableBoxEmptyController::VariableBoxEmptyView::drawRect(KDContext * ctx, KDRect rect) const {
drawBorderOfRect(ctx, bounds(), Palette::GreyBright);
}
int VariableBoxEmptyController::VariableBoxEmptyView::numberOfSubviews() const {
return k_numberOfMessages+1;
}
@@ -42,20 +46,20 @@ View * VariableBoxEmptyController::VariableBoxEmptyView::subviewAtIndex(int inde
return &m_messages[index-1];
}
void VariableBoxEmptyController::VariableBoxEmptyView::layoutSubviews() {
KDCoordinate width = bounds().width();
KDCoordinate height = bounds().height();
void VariableBoxEmptyController::VariableBoxEmptyView::layoutSubviews(bool force) {
KDCoordinate width = bounds().width() - 2*k_separatorThickness;
KDCoordinate height = bounds().height() - 2*k_separatorThickness;
KDCoordinate textHeight = k_font->glyphSize().height();
KDCoordinate layoutHeight = m_layoutExample.minimalSizeForOptimalDisplay().height();
KDCoordinate margin = (height - k_numberOfMessages*textHeight-layoutHeight)/2;
m_layoutExample.setFrame(KDRect(0, margin+k_layoutRowIndex*textHeight, width, layoutHeight));
KDCoordinate currentHeight = 0;
m_layoutExample.setFrame(KDRect(k_separatorThickness, k_separatorThickness+margin+k_layoutRowIndex*textHeight, width, layoutHeight), force);
KDCoordinate currentHeight = k_separatorThickness;
for (uint8_t i = 0; i < k_numberOfMessages; i++) {
if (i == k_layoutRowIndex) {
currentHeight += layoutHeight;
}
KDCoordinate h = i == 0 || i == k_numberOfMessages - 1 ? textHeight+margin : textHeight;
m_messages[i].setFrame(KDRect(0, currentHeight, width, h));
m_messages[i].setFrame(KDRect(k_separatorThickness, currentHeight, width, h), force);
currentHeight += h;
}
}