From a9016c683b2df1b84390c124286a1dbe2ca3ff2b Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Mon, 2 Feb 2026 14:09:43 +0300 Subject: [PATCH] Set values inside bookProgressBarHeight() --- src/ScreenComponents.cpp | 7 +++++-- src/ScreenComponents.h | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ScreenComponents.cpp b/src/ScreenComponents.cpp index 4a9d7ec5..50ce76c3 100644 --- a/src/ScreenComponents.cpp +++ b/src/ScreenComponents.cpp @@ -59,10 +59,13 @@ int ScreenComponents::bookProgressBarHeight() { const bool isVertical = (orientation == CrossPointSettings::ORIENTATION::PORTRAIT || orientation == CrossPointSettings::ORIENTATION::INVERTED); + constexpr int bookProgressBarVerticalHeight = 4; + constexpr int bookProgressBarHorizontalHeight = 2; + if (isVertical) { - return ScreenComponents::BOOK_PROGRESS_BAR_VERTICAL_HEIGHT; + return bookProgressBarVerticalHeight; } else { - return ScreenComponents::BOOK_PROGRESS_BAR_HORIZONTAL_HEIGHT; + return bookProgressBarHorizontalHeight; } } diff --git a/src/ScreenComponents.h b/src/ScreenComponents.h index a634b3ee..de1f9e20 100644 --- a/src/ScreenComponents.h +++ b/src/ScreenComponents.h @@ -13,8 +13,6 @@ struct TabInfo { class ScreenComponents { public: - static const int BOOK_PROGRESS_BAR_VERTICAL_HEIGHT = 4; - static const int BOOK_PROGRESS_BAR_HORIZONTAL_HEIGHT = 2; static int bookProgressBarHeight(); static void drawBattery(const GfxRenderer& renderer, int left, int top, bool showPercentage = true);