UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-30 04:00:02 +02: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

5
escher/src/warning_controller.cpp
View File

@@ -1,7 +1,6 @@
#include <escher/warning_controller.h>
#include <escher/container.h>
static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; }
#include <algorithm>
WarningController::ContentView::ContentView() :
SolidColorView(KDColorBlack),
@@ -46,7 +45,7 @@ KDSize WarningController::ContentView::minimalSizeForOptimalDisplay() const {
}
assert(numberOfSubviews() == 2);
KDSize textSize2 = m_textView2.minimalSizeForOptimalDisplay();
return KDSize(maxCoordinate(textSize1.width(), textSize2.width()) + k_horizontalMargin,
return KDSize(std::max(textSize1.width(), textSize2.width()) + k_horizontalMargin,
textSize1.height() + textSize2.height() + 2*k_topAndBottomMargin + k_middleMargin);
}