02f2474e3b
Migrate 5 mod Activity subclasses from old polling-based display task pattern to the upstream render() super-class pattern with freeRTOS notification: - EpubReaderBookmarkSelectionActivity - DictionaryWordSelectActivity - DictionarySuggestionsActivity - DictionaryDefinitionActivity - LookedUpWordsActivity Changes: remove own TaskHandle/SemaphoreHandle/updateRequired, use requestUpdate() + render(RenderLock&&) override, fix potential deadlocks around enterNewActivity() calls. Also fix stale conflict marker in EpubReaderMenuActivity.h. Co-authored-by: Cursor <cursoragent@cursor.com>
43 lines
1.4 KiB
C++
43 lines
1.4 KiB
C++
#pragma once
|
|
#include <functional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "../ActivityWithSubactivity.h"
|
|
#include "util/ButtonNavigator.h"
|
|
|
|
class DictionarySuggestionsActivity final : public ActivityWithSubactivity {
|
|
public:
|
|
explicit DictionarySuggestionsActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
|
const std::string& originalWord, const std::vector<std::string>& suggestions,
|
|
int readerFontId, uint8_t orientation, const std::string& cachePath,
|
|
const std::function<void()>& onBack, const std::function<void()>& onDone)
|
|
: ActivityWithSubactivity("DictionarySuggestions", renderer, mappedInput),
|
|
originalWord(originalWord),
|
|
suggestions(suggestions),
|
|
readerFontId(readerFontId),
|
|
orientation(orientation),
|
|
cachePath(cachePath),
|
|
onBack(onBack),
|
|
onDone(onDone) {}
|
|
|
|
void onEnter() override;
|
|
void onExit() override;
|
|
void loop() override;
|
|
void render(Activity::RenderLock&&) override;
|
|
|
|
private:
|
|
std::string originalWord;
|
|
std::vector<std::string> suggestions;
|
|
int readerFontId;
|
|
uint8_t orientation;
|
|
std::string cachePath;
|
|
const std::function<void()> onBack;
|
|
const std::function<void()> onDone;
|
|
|
|
int selectedIndex = 0;
|
|
bool pendingBackFromDef = false;
|
|
bool pendingExitToReader = false;
|
|
ButtonNavigator buttonNavigator;
|
|
};
|