diff --git a/apps/shared/curve_view.cpp b/apps/shared/curve_view.cpp index 29e21e178..563eeb13d 100644 --- a/apps/shared/curve_view.cpp +++ b/apps/shared/curve_view.cpp @@ -558,8 +558,12 @@ KDRect CurveView::bannerFrame() { KDRect CurveView::okFrame() { KDRect okFrame = KDRectZero; if (m_okView && (m_mainViewSelected || m_forceOkDisplay)) { + KDCoordinate bannerHeight = 0; + if (m_bannerView != nullptr) { + bannerHeight = m_bannerView->minimalSizeForOptimalDisplay().height(); + } KDSize okSize = m_okView->minimalSizeForOptimalDisplay(); - okFrame = KDRect(bounds().width()- okSize.width()-k_okHorizontalMargin, bounds().y()+k_okVerticalMargin, okSize); + okFrame = KDRect(bounds().width()- okSize.width()-k_okHorizontalMargin, bounds().height()- bannerHeight-okSize.height()-k_okVerticalMargin, okSize); } return okFrame; } diff --git a/apps/shared/curve_view.h b/apps/shared/curve_view.h index 21fbeb208..d92395614 100644 --- a/apps/shared/curve_view.h +++ b/apps/shared/curve_view.h @@ -38,7 +38,7 @@ protected: // Drawing methods virtual float samplingRatio() const; constexpr static KDCoordinate k_labelMargin = 4; - constexpr static KDCoordinate k_okVerticalMargin = 3; + constexpr static KDCoordinate k_okVerticalMargin = 23; constexpr static KDCoordinate k_okHorizontalMargin = 10; constexpr static KDCoordinate k_labelGraduationLength = 6; constexpr static int k_maxNumberOfXLabels = CurveViewRange::k_maxNumberOfXGridUnits;