From 5e8da3a12a5270f4a075fbe49fd9c1a167d0e8a9 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Sat, 23 May 2026 20:13:39 +0200 Subject: [PATCH] yaclf --- .../reader/QuickOverridesActivity.cpp | 19 ++++++++++--------- .../reader/QuickOverridesActivity.h | 11 +++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/activities/reader/QuickOverridesActivity.cpp b/src/activities/reader/QuickOverridesActivity.cpp index 7316e09f..b1fba80b 100644 --- a/src/activities/reader/QuickOverridesActivity.cpp +++ b/src/activities/reader/QuickOverridesActivity.cpp @@ -57,7 +57,8 @@ void QuickOverridesActivity::buildMenuItems() { menuItems.push_back(SettingInfo::DynamicEnumCtx( StrId::STR_EMBEDDED_STYLE, {StrId::STR_DEFAULT_VALUE, StrId::STR_STATE_ON, StrId::STR_STATE_OFF}, self, [](const void* ctx) -> uint8_t { - return threeStateSlotFromOverride(static_cast(ctx)->pendingEmbeddedStyleOverride); + return threeStateSlotFromOverride( + static_cast(ctx)->pendingEmbeddedStyleOverride); }, [](void* ctx, uint8_t v) { static_cast(ctx)->pendingEmbeddedStyleOverride = threeStateOverrideFromSlot(v); @@ -114,7 +115,8 @@ void QuickOverridesActivity::buildMenuItems() { menuItems.push_back(SettingInfo::DynamicEnumCtx( StrId::STR_BIONIC_READING, {StrId::STR_DEFAULT_VALUE, StrId::STR_STATE_ON, StrId::STR_STATE_OFF}, self, [](const void* ctx) -> uint8_t { - return threeStateSlotFromOverride(static_cast(ctx)->pendingBionicReadingOverride); + return threeStateSlotFromOverride( + static_cast(ctx)->pendingBionicReadingOverride); }, [](void* ctx, uint8_t v) { static_cast(ctx)->pendingBionicReadingOverride = threeStateOverrideFromSlot(v); @@ -128,8 +130,9 @@ void QuickOverridesActivity::buildMenuItems() { self, [](const void* ctx) -> uint8_t { const auto* s = static_cast(ctx); - return (s->pendingParagraphAlignmentOverride < 0) ? 0 - : static_cast(s->pendingParagraphAlignmentOverride + 1); + return (s->pendingParagraphAlignmentOverride < 0) + ? 0 + : static_cast(s->pendingParagraphAlignmentOverride + 1); }, [](void* ctx, uint8_t v) { auto* s = static_cast(ctx); @@ -172,9 +175,7 @@ void QuickOverridesActivity::onSettingToggled(int /*index*/) { renderer.setNextDisplayRefreshMode(HalDisplay::FAST_REFRESH); } -void QuickOverridesActivity::onBackPressed() { - finishWithResult(/*cancelled=*/false); -} +void QuickOverridesActivity::onBackPressed() { finishWithResult(/*cancelled=*/false); } void QuickOverridesActivity::finishWithResult(bool cancelled) { ActivityResult result; @@ -201,8 +202,8 @@ void QuickOverridesActivity::render(RenderLock&&) { const Rect contentRect = UITheme::getContentRect(renderer, true, false); const std::string title = tr(STR_QUICK_OVERRIDES); - const int titleX = - contentRect.x + (contentRect.width - renderer.getTextWidth(UI_12_FONT_ID, title.c_str(), EpdFontFamily::BOLD)) / 2; + const int titleX = contentRect.x + + (contentRect.width - renderer.getTextWidth(UI_12_FONT_ID, title.c_str(), EpdFontFamily::BOLD)) / 2; renderer.drawText(UI_12_FONT_ID, titleX, 15 + contentRect.y, title.c_str(), true, EpdFontFamily::BOLD); const int startY = 50 + contentRect.y; diff --git a/src/activities/reader/QuickOverridesActivity.h b/src/activities/reader/QuickOverridesActivity.h index 25ff4368..b952f18f 100644 --- a/src/activities/reader/QuickOverridesActivity.h +++ b/src/activities/reader/QuickOverridesActivity.h @@ -13,12 +13,11 @@ // path, which itself short-circuits when nothing changed. class QuickOverridesActivity final : public MenuListActivity { public: - QuickOverridesActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, - int8_t initialEmbeddedStyleOverride, int8_t initialImageRenderingOverride, - int8_t initialFontFamilyOverride, const std::string& initialSdFontFamilyOverride, - int8_t initialFontSizeOverride, int8_t initialBionicReadingOverride, - int8_t initialParagraphAlignmentOverride, int8_t initialTextAntiAliasingOverride, - int8_t initialHyphenationOverride); + QuickOverridesActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, int8_t initialEmbeddedStyleOverride, + int8_t initialImageRenderingOverride, int8_t initialFontFamilyOverride, + const std::string& initialSdFontFamilyOverride, int8_t initialFontSizeOverride, + int8_t initialBionicReadingOverride, int8_t initialParagraphAlignmentOverride, + int8_t initialTextAntiAliasingOverride, int8_t initialHyphenationOverride); void onEnter() override; void render(RenderLock&&) override;