From eb203f3ba3c0f3a4c4b7e725a5598e99a47d2b64 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Thu, 7 May 2026 19:54:40 +0200 Subject: [PATCH] Properly wrap message --- .../settings/SdFirmwareUpdateActivity.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/activities/settings/SdFirmwareUpdateActivity.cpp b/src/activities/settings/SdFirmwareUpdateActivity.cpp index 9cb43e19..971f6d2d 100644 --- a/src/activities/settings/SdFirmwareUpdateActivity.cpp +++ b/src/activities/settings/SdFirmwareUpdateActivity.cpp @@ -22,10 +22,9 @@ void SdFirmwareUpdateActivity::onEnter() { } void SdFirmwareUpdateActivity::launchPicker() { - startActivityForResult( - std::make_unique(renderer, mappedInput, "/", std::string{}, - FileBrowserActivity::Mode::PickFirmware), - [this](const ActivityResult& result) { onPickerResult(result); }); + startActivityForResult(std::make_unique(renderer, mappedInput, "/", std::string{}, + FileBrowserActivity::Mode::PickFirmware), + [this](const ActivityResult& result) { onPickerResult(result); }); } void SdFirmwareUpdateActivity::onPickerResult(const ActivityResult& result) { @@ -214,7 +213,13 @@ void SdFirmwareUpdateActivity::render(RenderLock&&) { renderer.drawCenteredText(UI_10_FONT_ID, y, tr(STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF)); } else if (state == State::SUCCESS) { renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_UPDATE_COMPLETE), true, EpdFontFamily::BOLD); - renderer.drawCenteredText(UI_10_FONT_ID, top + lineHeight + metrics.verticalSpacing, tr(STR_RESTARTING_HINT)); + const int hintWidth = pageWidth - 2 * metrics.contentSidePadding; + const auto hintLines = renderer.wrappedText(UI_10_FONT_ID, tr(STR_RESTARTING_HINT), hintWidth, 4); + int hintY = top + lineHeight + metrics.verticalSpacing; + for (const auto& line : hintLines) { + renderer.drawCenteredText(UI_10_FONT_ID, hintY, line.c_str()); + hintY += lineHeight; + } } else if (state == State::FAILED) { renderer.drawCenteredText(UI_10_FONT_ID, top, tr(STR_UPDATE_FAILED), true, EpdFontFamily::BOLD); if (!errorMessage.empty()) {