eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fill the gap under the screen for the progress bar (#2138)

Browse Source
This commit is contained in:
Eloren1
2026-05-25 15:10:45 -04:00
committed by GitHub
parent b53ac3d52c
commit d7797baff2
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/settings/StatusBarSettingsActivity.cpp
+1 -1
View File
@@ -251,7 +251,7 @@ void StatusBarSettingsActivity::render(RenderLock&&) {
title = tr(STR_EXAMPLE_CHAPTER); title = tr(STR_EXAMPLE_CHAPTER);
} }
GUI.drawStatusBar(renderer, 75, 8, 32, title, verticalPreviewPadding); GUI.drawStatusBar(renderer, 75, 8, 32, title, verticalPreviewPadding, 0, false);
renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding, renderer.drawText(UI_10_FONT_ID, metrics.contentSidePadding,
renderer.getScreenHeight() - UITheme::getInstance().getStatusBarHeight() - verticalPreviewPadding - renderer.getScreenHeight() - UITheme::getInstance().getStatusBarHeight() - verticalPreviewPadding -
src/components/themes/BaseTheme.cpp
+8 -5
View File
@@ -721,8 +721,8 @@ void BaseTheme::fillPopupProgress(const GfxRenderer& renderer, const Rect& layou
} }
void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, const int currentPage, void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, const int currentPage,
const int pageCount, std::string title, const int paddingBottom, const int pageCount, std::string title, const int paddingBottom, const int textYOffset,
const int textYOffset) const { const bool fillMargin) const {
auto metrics = UITheme::getInstance().getMetrics(); auto metrics = UITheme::getInstance().getMetrics();
int orientedMarginTop, orientedMarginRight, orientedMarginBottom, orientedMarginLeft; int orientedMarginTop, orientedMarginRight, orientedMarginBottom, orientedMarginLeft;
renderer.getOrientedViewableTRBL(&orientedMarginTop, &orientedMarginRight, &orientedMarginBottom, renderer.getOrientedViewableTRBL(&orientedMarginTop, &orientedMarginRight, &orientedMarginBottom,
@@ -754,7 +754,9 @@ void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, c
// Draw Progress Bar // Draw Progress Bar
if (SETTINGS.statusBarProgressBar != CrossPointSettings::STATUS_BAR_PROGRESS_BAR::HIDE_PROGRESS) { if (SETTINGS.statusBarProgressBar != CrossPointSettings::STATUS_BAR_PROGRESS_BAR::HIDE_PROGRESS) {
const int progressBarMaxWidth = renderer.getScreenWidth() - orientedMarginLeft - orientedMarginRight; const int barMarginLeft = fillMargin ? 0 : orientedMarginLeft;
const int barMarginRight = fillMargin ? 0 : orientedMarginRight;
const int progressBarMaxWidth = renderer.getScreenWidth() - barMarginLeft - barMarginRight;
const int progressBarY = renderer.getScreenHeight() - orientedMarginBottom - const int progressBarY = renderer.getScreenHeight() - orientedMarginBottom -
((SETTINGS.statusBarProgressBarThickness + 1) * 2) - paddingBottom; ((SETTINGS.statusBarProgressBarThickness + 1) * 2) - paddingBottom;
size_t progress; size_t progress;
@@ -765,8 +767,9 @@ void BaseTheme::drawStatusBar(GfxRenderer& renderer, const float bookProgress, c
progress = (pageCount > 0) ? (static_cast<float>(currentPage) / pageCount) * 100 : 0; progress = (pageCount > 0) ? (static_cast<float>(currentPage) / pageCount) * 100 : 0;
} }
const int barWidth = progressBarMaxWidth * progress / 100; const int barWidth = progressBarMaxWidth * progress / 100;
renderer.fillRect(orientedMarginLeft, progressBarY, barWidth, ((SETTINGS.statusBarProgressBarThickness + 1) * 2), const int barHeight =
true); ((SETTINGS.statusBarProgressBarThickness + 1) * 2) + (fillMargin ? orientedMarginBottom - 1 : 0);
renderer.fillRect(barMarginLeft, progressBarY, barWidth, barHeight, true);
} }
// Draw Battery // Draw Battery
src/components/themes/BaseTheme.h
+2 -1
View File
@@ -203,7 +203,8 @@ class BaseTheme {
virtual Rect drawPopup(const GfxRenderer& renderer, const char* message) const; virtual Rect drawPopup(const GfxRenderer& renderer, const char* message) const;
virtual void fillPopupProgress(const GfxRenderer& renderer, const Rect& layout, const int progress) const; virtual void fillPopupProgress(const GfxRenderer& renderer, const Rect& layout, const int progress) const;
void drawStatusBar(GfxRenderer& renderer, const float bookProgress, const int currentPage, const int pageCount, void drawStatusBar(GfxRenderer& renderer, const float bookProgress, const int currentPage, const int pageCount,
std::string title, const int paddingBottom = 0, const int textYOffset = 0) const; std::string title, const int paddingBottom = 0, const int textYOffset = 0,
const bool fillMargin = true) const;
void drawHelpText(const GfxRenderer& renderer, Rect rect, const char* label) const; void drawHelpText(const GfxRenderer& renderer, Rect rect, const char* label) const;
virtual void drawTextField(const GfxRenderer& renderer, Rect rect, const int textWidth, bool cursorMode = false, virtual void drawTextField(const GfxRenderer& renderer, Rect rect, const int textWidth, bool cursorMode = false,
int contentStartX = 0, int contentWidth = 0) const; int contentStartX = 0, int contentWidth = 0) const;