mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-03-21 14:50:44 +01:00
Explicit std::min/max template usage
This is unfortunately required in several cases: - Sometimes when we use either float and double (this should be changed) - Because KDCoordinate is not an int, so any arithmemtic promotes it to an int - Because we mix pointer differences and ints
This commit is contained in:
@@ -127,7 +127,7 @@ KDCoordinate VariableBoxController::rowHeight(int index) {
|
||||
if (m_currentPage != Page::RootMenu) {
|
||||
Layout layoutR = expressionLayoutForRecord(recordAtIndex(index), index);
|
||||
if (!layoutR.isUninitialized()) {
|
||||
return std::max(layoutR.layoutSize().height()+k_leafMargin, Metric::ToolboxRowHeight);
|
||||
return std::max<KDCoordinate>(layoutR.layoutSize().height()+k_leafMargin, Metric::ToolboxRowHeight);
|
||||
}
|
||||
}
|
||||
return NestedMenuController::rowHeight(index);
|
||||
|
||||
Reference in New Issue
Block a user