UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-30 04:00:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

[apps/reg] Actualize the current model display in the menu

Browse Source
This commit is contained in:
Léa Saviot
2018-06-07 14:42:07 +02:00
committed by Émilie Feral
parent 6c93e55687
commit 47802341f8
7 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
escher/src/expression_view.cpp
View File

@@ -7,7 +7,8 @@ ExpressionView::ExpressionView(float horizontalAlignment, float verticalAlignmen
m_horizontalAlignment(horizontalAlignment),
m_verticalAlignment(verticalAlignment),
m_textColor(textColor),
m_backgroundColor(backgroundColor)
m_backgroundColor(backgroundColor),
m_horizontalMargin(0)
{
}
@@ -48,12 +49,13 @@ KDSize ExpressionView::minimalSizeForOptimalDisplay() const {
if (m_expressionLayout == nullptr) {
return KDSizeZero;
}
return m_expressionLayout->size();
KDSize expressionSize = m_expressionLayout->size();
return KDSize(expressionSize.width() + 2*m_horizontalMargin, expressionSize.height());
}
KDPoint ExpressionView::drawingOrigin() const {
KDSize expressionSize = m_expressionLayout->size();
return KDPoint(m_horizontalAlignment*(m_frame.width() - expressionSize.width()), max(0, (m_frame.height() - expressionSize.height())/2));
return KDPoint(m_horizontalMargin + m_horizontalAlignment*(m_frame.width() - 2*m_horizontalMargin - expressionSize.width()), max(0, (m_frame.height() - expressionSize.height())/2));
}
KDPoint ExpressionView::absoluteDrawingOrigin() const {