[apps/escher] EvenOddExpressionCell has left and right margins

This commit is contained in:
Léa Saviot
2018-06-12 15:34:14 +02:00
parent a83ef756b3
commit acc49412f1
11 changed files with 33 additions and 49 deletions

View File

@@ -9,19 +9,22 @@ FunctionExpressionCell::FunctionExpressionCell() :
KDSize FunctionExpressionCell::minimalSizeForOptimalDisplay() const {
KDSize expressionSize = m_expressionView.minimalSizeForOptimalDisplay();
return KDSize(m_margin+expressionSize.width(), expressionSize.height()+k_separatorThickness);
return KDSize(m_leftMargin + expressionSize.width() + m_rightMargin, expressionSize.height()+k_separatorThickness);
}
void FunctionExpressionCell::drawRect(KDContext * ctx, KDRect rect) const {
KDColor separatorColor = m_even ? Palette::WallScreen : KDColorWhite;
// Color the horizontal separator
ctx->fillRect(KDRect(0, bounds().height()-k_separatorThickness, bounds().width(), k_separatorThickness), separatorColor);
// Color the margin
ctx->fillRect(KDRect(0, 0, m_margin, bounds().height()-k_separatorThickness), backgroundColor());
// Color the left margin
ctx->fillRect(KDRect(0, 0, m_leftMargin, bounds().height()-k_separatorThickness), backgroundColor());
// Color the right margin
ctx->fillRect(KDRect(0, bounds().width() - m_rightMargin, m_rightMargin, bounds().height()-k_separatorThickness), backgroundColor());
}
void FunctionExpressionCell::layoutSubviews() {
KDRect expressionFrame(m_margin, 0, bounds().width() - m_margin, bounds().height()-k_separatorThickness);
KDRect expressionFrame(m_leftMargin, 0, bounds().width() - m_leftMargin - m_rightMargin, bounds().height()-k_separatorThickness);
m_expressionView.setFrame(expressionFrame);
}