UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Improve variable box leaf cells

Browse Source 
Change-Id: Ib7b39731e0408f40ff38d56d78636c85442a2f34
This commit is contained in:
Émilie Feral
2017-04-11 18:23:25 +02:00
parent 51ca54a52d
commit 8b355814ec
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/variable_box_leaf_cell.cpp
View File

@@ -37,14 +37,14 @@ void VariableBoxLeafCell::layoutSubviews() {
KDCoordinate width = bounds().width();
KDCoordinate height = bounds().height();
if (numberOfSubviews() == 3) {
m_labelView.setFrame(KDRect(1, 1, width/2-1, height/2 - 1));
m_subtitleView.setFrame(KDRect(1, height/2, width/2-1, height/2));
m_labelView.setFrame(KDRect(k_separatorThickness+k_widthMargin, k_separatorThickness, width/2-k_separatorThickness-k_widthMargin, height/2 - k_separatorThickness));
m_subtitleView.setFrame(KDRect(k_separatorThickness+k_widthMargin, height/2, width/2-k_widthMargin-k_separatorThickness, height/2));
m_subtitleView.setAlignment(0.0f, 0.5f);
m_expressionView.setFrame(KDRect(width/2, 1, width/2-1, height-2));
m_expressionView.setFrame(KDRect(width/2, k_separatorThickness, width/2-k_separatorThickness-k_widthMargin, height-2*k_separatorThickness));
return;
}
m_labelView.setFrame(KDRect(1, 1, width/2-1, height-2));
m_subtitleView.setFrame(KDRect(width/2, 1, width/2-1, height-2));
m_labelView.setFrame(KDRect(k_separatorThickness+k_widthMargin, k_separatorThickness, width/2-k_separatorThickness-k_widthMargin, height-2*k_separatorThickness));
m_subtitleView.setFrame(KDRect(width/2, 1, width/2-k_separatorThickness-k_widthMargin, height-2*k_separatorThickness));
m_subtitleView.setAlignment(1.0f, 0.5f);
return;
}

2
apps/variable_box_leaf_cell.h
View File

@@ -13,6 +13,8 @@ public:
void setExpression(Poincare::ExpressionLayout * expressionLayout);
void drawRect(KDContext * ctx, KDRect rect) const override;
private:
constexpr static KDCoordinate k_separatorThickness = 1;
constexpr static KDCoordinate k_widthMargin = 10;
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
void layoutSubviews() override;