[Update] Upstream

This commit is contained in:
Quentin
2020-06-18 19:25:17 +02:00
96 changed files with 1051 additions and 660 deletions

View File

@@ -58,10 +58,15 @@ int ZoomParameterController::ContentView::numberOfSubviews() const {
View * ZoomParameterController::ContentView::subviewAtIndex(int index) {
assert(index >= 0 && index < 2);
/* The order of subview is important here :
* If we redraw the curveView before the legendView, that can have some display issue, when exiting sleep mode, which
can be visible, if the redraw of curveView is long (with complicated curve), so we prefer to have legendView
at first subview.
*/
if (index == 0) {
return m_curveView;
return &m_legendView;
}
return &m_legendView;
return m_curveView;
}
void ZoomParameterController::ContentView::layoutSubviews(bool force) {