UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-26 17:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/sequence] Align sequence title and expression baselines

Browse Source
This commit is contained in:
Léa Saviot
2018-11-30 11:16:04 +01:00
parent 64446f24e6
commit 3595a8e628
13 changed files with 72 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/shared/function_title_cell.cpp
View File

@@ -3,6 +3,9 @@
namespace Shared {
static inline float min(float x, float y) { return (x<y ? x : y); }
static inline float max(float x, float y) { return (x>y ? x : y); }
void FunctionTitleCell::setOrientation(Orientation orientation) {
m_orientation = orientation;
reloadCell();
@@ -44,7 +47,15 @@ KDRect FunctionTitleCell::subviewFrame() const {
return KDRect(k_colorIndicatorThickness, 0, bounds().width() - k_colorIndicatorThickness - k_equalWidthWithMargins, bounds().height()-k_separatorThickness);
}
return KDRect(0, k_colorIndicatorThickness, bounds().width(), bounds().height()-k_colorIndicatorThickness);
}
float FunctionTitleCell::verticalAlignment() const {
assert(m_orientation == Orientation::VerticalIndicator);
return max(
0.0f,
min(
1.0f,
m_baseline < 0 ? 0.5f : verticalAlignmentGivenExpressionBaselineAndRowHeight(m_baseline, subviewFrame().height())));
}
}