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

[poincare] Fix fix CharLayout: avoid adding multiplication sign between Sto

Browse Source 
and another expression without breaking other writeTextInBuffer
(1+x+x^2+x^3)
This commit is contained in:
Émilie Feral
2018-05-25 09:44:30 +02:00
committed by LeaNumworks
parent d11967f41a
commit 20f60319bf
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
poincare/src/layout/char_layout.cpp
View File

@@ -59,13 +59,6 @@ bool CharLayout::isCollapsable(int * numberOfOpenParenthesis, bool goingLeft) co
return true;
}
bool CharLayout::canBeOmittedMultiplicationLeftFactor() const {
return m_char != Ion::Charset::Sto;
}
bool CharLayout::canBeOmittedMultiplicationRightFactor() const {
return m_char != Ion::Charset::Sto;
}
void CharLayout::render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) {
char string[2] = {m_char, 0};
ctx->drawString(string, p, m_fontSize, expressionColor, backgroundColor);

2
poincare/src/layout/char_layout.h
View File

@@ -28,8 +28,6 @@ public:
// Other
bool isCollapsable(int * numberOfOpenParenthesis, bool goingLeft) const override;
bool canBeOmittedMultiplicationLeftFactor() const override;
bool canBeOmittedMultiplicationRightFactor() const override;
protected:
void render(KDContext * ctx, KDPoint p, KDColor expressionColor, KDColor backgroundColor) override;
KDPoint positionOfChild(ExpressionLayout * child) override {