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

Remove max/min inline from KDCoordinate header

Browse Source
This commit is contained in:
Léa Saviot
2019-01-23 15:52:10 +01:00
committed by Émilie Feral
parent a7b51f92ee
commit 496d346049
52 changed files with 204 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/shared/function_title_cell.cpp
View File

@@ -3,8 +3,8 @@
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); }
static inline float minFloat(float x, float y) { return x < y ? x : y; }
static inline float maxFloat(float x, float y) { return x > y ? x : y; }
void FunctionTitleCell::setOrientation(Orientation orientation) {
m_orientation = orientation;
@@ -51,9 +51,9 @@ KDRect FunctionTitleCell::subviewFrame() const {
float FunctionTitleCell::verticalAlignment() const {
assert(m_orientation == Orientation::VerticalIndicator);
return max(
return maxFloat(
0.0f,
min(
minFloat(
1.0f,
m_baseline < 0 ? 0.5f : verticalAlignmentGivenExpressionBaselineAndRowHeight(m_baseline, subviewFrame().height())));
}