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

[Fix] Conflicts

Browse Source
This commit is contained in:
Quentin
2020-04-16 14:04:56 +02:00
parent e77e26e2de 61399d07eb
commit f37040dc8a
335 changed files with 2110 additions and 1685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/shared/function_list_controller.cpp
View File

@@ -1,10 +1,11 @@
#include "function_list_controller.h"
#include "function_app.h"
#include "function_expression_cell.h"
#include <algorithm>
namespace Shared {
static inline int maxInt(int x, int y) { return x > y ? x : y; }
constexpr KDCoordinate FunctionListController::k_minTitleColumnWidth;
FunctionListController::FunctionListController(Responder * parentResponder, ButtonRowController * header, ButtonRowController * footer, I18n::Message text) :
ExpressionModelListController(parentResponder, text),
@@ -243,7 +244,7 @@ void FunctionListController::computeTitlesColumnWidth(bool forceMax) {
return;
}
KDCoordinate maxTitleWidth = maxFunctionNameWidth()+k_functionTitleSumOfMargins;
m_titlesColumnWidth = maxInt(maxTitleWidth, k_minTitleColumnWidth);
m_titlesColumnWidth = std::max(maxTitleWidth, k_minTitleColumnWidth);
}
TabViewController * FunctionListController::tabController() const {
@@ -262,7 +263,7 @@ KDCoordinate FunctionListController::maxFunctionNameWidth() {
const char * functionName = record.fullName();
const char * dotPosition = strchr(functionName, Ion::Storage::k_dotChar);
assert(dotPosition != nullptr);
maxNameLength = maxInt(maxNameLength, dotPosition-functionName);
maxNameLength = std::max(maxNameLength, static_cast<int>(dotPosition-functionName));
}
return nameWidth(maxNameLength + Function::k_parenthesedArgumentCodePointLength);
}