From f20cb1036579bbbcbe09812e747aecd24adb5de7 Mon Sep 17 00:00:00 2001 From: Jonas Diemer Date: Tue, 20 Jan 2026 08:04:30 +0100 Subject: [PATCH] Formatting fixes --- .../reader/EpubReaderMenuActivity.cpp | 8 ++++--- .../reader/EpubReaderMenuActivity.h | 23 ++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/activities/reader/EpubReaderMenuActivity.cpp b/src/activities/reader/EpubReaderMenuActivity.cpp index cac6f4aa..2503575c 100644 --- a/src/activities/reader/EpubReaderMenuActivity.cpp +++ b/src/activities/reader/EpubReaderMenuActivity.cpp @@ -1,5 +1,7 @@ #include "EpubReaderMenuActivity.h" + #include + #include "fontIds.h" void EpubReaderMenuActivity::onEnter() { @@ -46,11 +48,11 @@ void EpubReaderMenuActivity::loop() { // Use local variables for items we need to check after potential deletion if (mappedInput.wasReleased(MappedInputManager::Button::Up) || - mappedInput.wasReleased(MappedInputManager::Button::Left) ) { + mappedInput.wasReleased(MappedInputManager::Button::Left)) { selectedIndex = (selectedIndex + menuItems.size() - 1) % menuItems.size(); updateRequired = true; } else if (mappedInput.wasReleased(MappedInputManager::Button::Down) || - mappedInput.wasReleased(MappedInputManager::Button::Right)) { + mappedInput.wasReleased(MappedInputManager::Button::Right)) { selectedIndex = (selectedIndex + 1) % menuItems.size(); updateRequired = true; } else if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) { @@ -65,7 +67,7 @@ void EpubReaderMenuActivity::loop() { return; } else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) { onBack(); - return; // Also return here just in case + return; // Also return here just in case } } diff --git a/src/activities/reader/EpubReaderMenuActivity.h b/src/activities/reader/EpubReaderMenuActivity.h index 79ed4de5..f9ca7673 100644 --- a/src/activities/reader/EpubReaderMenuActivity.h +++ b/src/activities/reader/EpubReaderMenuActivity.h @@ -3,23 +3,21 @@ #include #include #include -#include -#include -#include -#include "MappedInputManager.h" +#include +#include +#include + #include "../ActivityWithSubactivity.h" +#include "MappedInputManager.h" class EpubReaderMenuActivity final : public ActivityWithSubactivity { public: enum class MenuAction { SELECT_CHAPTER, GO_HOME, DELETE_CACHE }; explicit EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, - const std::function& onBack, - const std::function& onAction) - : ActivityWithSubactivity("EpubReaderMenu", renderer, mappedInput), - onBack(onBack), - onAction(onAction) {} + const std::function& onBack, const std::function& onAction) + : ActivityWithSubactivity("EpubReaderMenu", renderer, mappedInput), onBack(onBack), onAction(onAction) {} void onEnter() override; void onExit() override; @@ -31,10 +29,9 @@ class EpubReaderMenuActivity final : public ActivityWithSubactivity { std::string label; }; - const std::vector menuItems = { - {MenuAction::SELECT_CHAPTER, "Select Chapter"}, - {MenuAction::GO_HOME, "Go Home"}, - {MenuAction::DELETE_CACHE, "Delete Book Cache"}}; + const std::vector menuItems = {{MenuAction::SELECT_CHAPTER, "Select Chapter"}, + {MenuAction::GO_HOME, "Go Home"}, + {MenuAction::DELETE_CACHE, "Delete Book Cache"}}; int selectedIndex = 0; bool updateRequired = false;