Fixed some conflicts

This commit is contained in:
Quentin Guidée
2020-02-12 17:42:58 +01:00
687 changed files with 13048 additions and 4057 deletions

View File

@@ -18,9 +18,9 @@ void FunctionExpressionCell::drawRect(KDContext * ctx, KDRect rect) const {
}
void FunctionExpressionCell::layoutSubviews() {
void FunctionExpressionCell::layoutSubviews(bool force) {
KDRect expressionFrame(m_leftMargin, 0, bounds().width() - m_leftMargin - m_rightMargin, bounds().height()-k_separatorThickness);
m_expressionView.setFrame(expressionFrame);
m_expressionView.setFrame(expressionFrame, force);
}
}