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

yaclf

Browse Source
This commit is contained in:
jpirnay
2026-05-23 20:13:39 +02:00
parent a03f5faad5
commit 5e8da3a12a
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/activities/reader/QuickOverridesActivity.cpp
+10 -9
View File
@@ -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<const QuickOverridesActivity*>(ctx)->pendingEmbeddedStyleOverride);
return threeStateSlotFromOverride(
static_cast<const QuickOverridesActivity*>(ctx)->pendingEmbeddedStyleOverride);
},
[](void* ctx, uint8_t v) {
static_cast<QuickOverridesActivity*>(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<const QuickOverridesActivity*>(ctx)->pendingBionicReadingOverride);
return threeStateSlotFromOverride(
static_cast<const QuickOverridesActivity*>(ctx)->pendingBionicReadingOverride);
},
[](void* ctx, uint8_t v) {
static_cast<QuickOverridesActivity*>(ctx)->pendingBionicReadingOverride = threeStateOverrideFromSlot(v);
@@ -128,8 +130,9 @@ void QuickOverridesActivity::buildMenuItems() {
self,
[](const void* ctx) -> uint8_t {
const auto* s = static_cast<const QuickOverridesActivity*>(ctx);
return (s->pendingParagraphAlignmentOverride < 0) ? 0
: static_cast<uint8_t>(s->pendingParagraphAlignmentOverride + 1);
return (s->pendingParagraphAlignmentOverride < 0)
? 0
: static_cast<uint8_t>(s->pendingParagraphAlignmentOverride + 1);
},
[](void* ctx, uint8_t v) {
auto* s = static_cast<QuickOverridesActivity*>(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;
src/activities/reader/QuickOverridesActivity.h
+5 -6
View File
@@ -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;