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

[poincare/integral_layout.cpp] Reduced the gap between integral sign and integrand

Browse Source 
The gap between the integral sign and the integrand has been reduced. It looks more natural this way.
This commit is contained in:
Arthur
2020-05-13 10:44:39 +02:00
committed by Émilie Feral
parent 9998f9b578
commit 45db7f1d48
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
poincare/src/integral_layout.cpp
View File

@@ -264,9 +264,9 @@ Horizontal margins and offsets
+-------------------------------------------------------------------------+
| | |
| |
| | +------------------+ |
| |<-upperBoundLengthOffset->| upperBoundWidth | |
| | +------------------+ |
| | +-----------------+ |
| |<-upperBoundLengthOffset->| upperBoundWidth | |
| | +-----------------+ |
| |
| | | |
| +++ |
@@ -277,20 +277,20 @@ Horizontal margins and offsets
| | |||| |
| ||| |
| | |||| |
|<-k_boundWidthMargin->|<-integralSymbolOffset->|||| |
| | |||| |
|<-k_boundWidthMargin->|<-integralSymbolOffset->|||| dx |
| | |||| ^ |
| ||| |
| | |||| |
| | |||| | |
| ||| |
| | | a | |
| | | a | | |
| +++ |
| | | a++| |
| | | a++| | |
| +++ |
| | | a | |
| | | a | | |
| |
| | +------------------+ |
| |<-lowerBoundLengthOffset->| lowerBoundWidth | |
| | +------------------+ |
| | +-----------------+ |
| |<-lowerBoundLengthOffset->| lowerBoundWidth | |
| | +-----------------+ |
| |
| | |
+-------------------------------------------------------------------------+
@@ -304,7 +304,7 @@ KDSize IntegralLayoutNode::computeSize() {
KDSize differentialSize = differentialLayout()->layoutSize();
KDSize lowerBoundSize = lowerBoundLayout()->layoutSize();
KDSize upperBoundSize = upperBoundLayout()->layoutSize();
KDCoordinate width = k_symbolWidth+k_lineThickness+k_boundWidthMargin+std::max(lowerBoundSize.width(), upperBoundSize.width())+k_integrandWidthMargin+integrandSize.width()+2*k_differentialWidthMargin+dSize.width()+differentialSize.width();
KDCoordinate width = k_symbolWidth+std::max(lowerBoundSize.width(), upperBoundSize.width())/2+integrandSize.width()+2*k_differentialWidthMargin+dSize.width()+differentialSize.width();
KDCoordinate height = upperBoundSize.height() + k_integrandHeigthMargin + k_symbolHeight + centralArgumentHeight() + k_symbolHeight + k_integrandHeigthMargin + lowerBoundSize.height();
return KDSize(width, height);
}
@@ -327,7 +327,7 @@ KDPoint IntegralLayoutNode::positionOfChild(LayoutNode * child) {
x = std::max(0, -difference);
y = 0;
} else if (child == integrandLayout()) {
x = k_symbolWidth + k_lineThickness + k_boundWidthMargin+std::max(lowerBoundSize.width(), upperBoundSize.width())+k_integrandWidthMargin;
x = k_symbolWidth + std::max(lowerBoundSize.width(), upperBoundSize.width())/2;
y = computeBaseline()-integrandLayout()->baseline();
} else {
assert(child == differentialLayout());