fix: remove percent rendering from activities (#1901)
This commit is contained in:
@@ -466,10 +466,6 @@ void FontDownloadActivity::render(RenderLock&&) {
|
|||||||
renderer,
|
renderer,
|
||||||
Rect{metrics.contentSidePadding, barY, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
|
Rect{metrics.contentSidePadding, barY, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
|
||||||
static_cast<int>(progress * 100), 100);
|
static_cast<int>(progress * 100), 100);
|
||||||
|
|
||||||
int percentY = barY + metrics.progressBarHeight + metrics.verticalSpacing;
|
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, percentY,
|
|
||||||
(std::to_string(static_cast<int>(progress * 100)) + "%").c_str());
|
|
||||||
} else if (state_ == COMPLETE) {
|
} else if (state_ == COMPLETE) {
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_FONT_INSTALLED), true, EpdFontFamily::BOLD);
|
renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_FONT_INSTALLED), true, EpdFontFamily::BOLD);
|
||||||
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", "");
|
||||||
|
|||||||
@@ -116,8 +116,8 @@ void OtaUpdateActivity::render(RenderLock&&) {
|
|||||||
static_cast<int>(updaterProgress * 100), 100);
|
static_cast<int>(updaterProgress * 100), 100);
|
||||||
|
|
||||||
y += metrics.progressBarHeight + metrics.verticalSpacing;
|
y += metrics.progressBarHeight + metrics.verticalSpacing;
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, y,
|
// Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty
|
||||||
(std::to_string(static_cast<int>(updaterProgress * 100)) + "%").c_str());
|
// so the bytes line below stays at the same Y it was at when the activity drew its own percent.
|
||||||
y += height + metrics.verticalSpacing;
|
y += height + metrics.verticalSpacing;
|
||||||
renderer.drawCenteredText(
|
renderer.drawCenteredText(
|
||||||
UI_10_FONT_ID, y,
|
UI_10_FONT_ID, y,
|
||||||
|
|||||||
@@ -230,7 +230,8 @@ void SdFirmwareUpdateActivity::render(RenderLock&&) {
|
|||||||
Rect{metrics.contentSidePadding, y, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
|
Rect{metrics.contentSidePadding, y, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight},
|
||||||
static_cast<int>(pct), 100);
|
static_cast<int>(pct), 100);
|
||||||
y += metrics.progressBarHeight + metrics.verticalSpacing;
|
y += metrics.progressBarHeight + metrics.verticalSpacing;
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, y, (std::to_string(pct) + "%").c_str());
|
// Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty
|
||||||
|
// so the do-not-power-off line below stays at the same Y as before.
|
||||||
y += lineHeight + metrics.verticalSpacing;
|
y += lineHeight + metrics.verticalSpacing;
|
||||||
renderer.drawCenteredText(UI_10_FONT_ID, y, tr(STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF));
|
renderer.drawCenteredText(UI_10_FONT_ID, y, tr(STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF));
|
||||||
} else if (state == State::SUCCESS) {
|
} else if (state == State::SUCCESS) {
|
||||||
|
|||||||
Reference in New Issue
Block a user