mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-05 15:17:37 +03:00
Run clang-format-fix
This commit is contained in:
parent
ffc30eb18c
commit
3664355b1a
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
|
||||||
#include "CrossPointSettings.h"
|
#include "CrossPointSettings.h"
|
||||||
|
#include "MappedInputManager.h"
|
||||||
#include "RecentBooksStore.h"
|
#include "RecentBooksStore.h"
|
||||||
#include "ScreenComponents.h"
|
#include "ScreenComponents.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|||||||
@ -162,7 +162,7 @@ void EpubReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect long-press and schedule skip immediately
|
// Detect long-press and schedule skip immediately
|
||||||
const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) ||
|
const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) ||
|
||||||
mappedInput.isPressed(MappedInputManager::Button::Left);
|
mappedInput.isPressed(MappedInputManager::Button::Left);
|
||||||
const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) ||
|
const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) ||
|
||||||
@ -213,7 +213,6 @@ void EpubReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// No current section, attempt to rerender the book
|
// No current section, attempt to rerender the book
|
||||||
if (!section) {
|
if (!section) {
|
||||||
updateRequired = true;
|
updateRequired = true;
|
||||||
|
|||||||
@ -2,15 +2,12 @@
|
|||||||
|
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
|
|
||||||
|
#include "CrossPointSettings.h"
|
||||||
#include "KOReaderCredentialStore.h"
|
#include "KOReaderCredentialStore.h"
|
||||||
#include "KOReaderSyncActivity.h"
|
#include "KOReaderSyncActivity.h"
|
||||||
#include "CrossPointSettings.h"
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
namespace {
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
bool EpubReaderChapterSelectionActivity::hasSyncOption() const { return KOREADER_STORE.hasCredentials(); }
|
bool EpubReaderChapterSelectionActivity::hasSyncOption() const { return KOREADER_STORE.hasCredentials(); }
|
||||||
|
|
||||||
int EpubReaderChapterSelectionActivity::getTotalItems() const {
|
int EpubReaderChapterSelectionActivity::getTotalItems() const {
|
||||||
|
|||||||
@ -110,7 +110,7 @@ void XtcReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect long-press and schedule skip immediately
|
// Detect long-press and schedule skip immediately
|
||||||
const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) ||
|
const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) ||
|
||||||
mappedInput.isPressed(MappedInputManager::Button::Left);
|
mappedInput.isPressed(MappedInputManager::Button::Left);
|
||||||
const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) ||
|
const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) ||
|
||||||
|
|||||||
@ -24,7 +24,7 @@ class XtcReaderActivity final : public ActivityWithSubactivity {
|
|||||||
bool delayedSkipPending = false;
|
bool delayedSkipPending = false;
|
||||||
int delayedSkipDir = 0;
|
int delayedSkipDir = 0;
|
||||||
uint32_t delayedSkipExecuteAtMs = 0;
|
uint32_t delayedSkipExecuteAtMs = 0;
|
||||||
uint32_t delayedSkipAmount = 0;
|
uint32_t delayedSkipAmount = 0;
|
||||||
bool awaitingReleaseAfterSkip = false;
|
bool awaitingReleaseAfterSkip = false;
|
||||||
bool skipUnpressed = false;
|
bool skipUnpressed = false;
|
||||||
const std::function<void()> onGoBack;
|
const std::function<void()> onGoBack;
|
||||||
|
|||||||
@ -6,9 +6,6 @@
|
|||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
namespace {
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
int XtcReaderChapterSelectionActivity::getPageItems() const {
|
int XtcReaderChapterSelectionActivity::getPageItems() const {
|
||||||
constexpr int startY = 60;
|
constexpr int startY = 60;
|
||||||
constexpr int lineHeight = 30;
|
constexpr int lineHeight = 30;
|
||||||
|
|||||||
@ -42,7 +42,7 @@ const SettingInfo controlsSettings[controlsSettingsCount] = {
|
|||||||
SettingInfo::Enum("Side Button Layout (reader)", &CrossPointSettings::sideButtonLayout,
|
SettingInfo::Enum("Side Button Layout (reader)", &CrossPointSettings::sideButtonLayout,
|
||||||
{"Prev, Next", "Next, Prev"}),
|
{"Prev, Next", "Next, Prev"}),
|
||||||
SettingInfo::Toggle("Long-press Chapter Skip", &CrossPointSettings::longPressChapterSkip),
|
SettingInfo::Toggle("Long-press Chapter Skip", &CrossPointSettings::longPressChapterSkip),
|
||||||
SettingInfo::Enum("Long-press Duration", &CrossPointSettings::longPressDuration, {"1s", "2s", "3s", "5s", "10s"}),
|
SettingInfo::Enum("Long-press Duration", &CrossPointSettings::longPressDuration, {"1s", "2s", "3s", "5s", "10s"}),
|
||||||
SettingInfo::Enum("Short Power Button Click", &CrossPointSettings::shortPwrBtn, {"Ignore", "Sleep", "Page Turn"})};
|
SettingInfo::Enum("Short Power Button Click", &CrossPointSettings::shortPwrBtn, {"Ignore", "Sleep", "Page Turn"})};
|
||||||
|
|
||||||
constexpr int systemSettingsCount = 5;
|
constexpr int systemSettingsCount = 5;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user