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

[escher/expression_field] Rename k_textFieldHeight to k_minimalHeight

Browse Source 
That constant has nothing to do with TextField. It is the minimal height
of ExpressionField.
This commit is contained in:
Ruben Dashyan
2019-10-01 13:55:03 +02:00
committed by Léa Saviot
parent 063cc66ba2
commit ecd6cb29f1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
escher/include/escher/expression_field.h
View File

@@ -39,7 +39,7 @@ public:
private:
static constexpr int k_textFieldBufferSize = TextField::maxBufferSize();
static constexpr KDCoordinate k_textFieldHeight = 37;
static constexpr KDCoordinate k_minimalHeight = 37;
static constexpr KDCoordinate k_horizontalMargin = 5;
static constexpr KDCoordinate k_verticalMargin = 5;
constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;

4
escher/src/expression_field.cpp
View File

@@ -113,9 +113,9 @@ bool ExpressionField::handleEventWithText(const char * text, bool indentation, b
KDCoordinate ExpressionField::inputViewHeight() const {
return k_separatorThickness
+ (editionIsInTextField() ? k_textFieldHeight :
+ (editionIsInTextField() ? k_minimalHeight :
minCoordinate(maximalHeight(),
maxCoordinate(k_textFieldHeight, m_layoutField.minimalSizeForOptimalDisplay().height())));
maxCoordinate(k_minimalHeight, m_layoutField.minimalSizeForOptimalDisplay().height())));
}
KDCoordinate ExpressionField::maximalHeight() const {