ServiceMenu: refactorització d'alguns métodes

ServiceMenu: en Video, amaga tamany de finestra quan está en fullscreen
This commit is contained in:
2025-06-24 14:12:44 +02:00
parent 50e7dad1c1
commit 7e59584c40
2 changed files with 89 additions and 38 deletions

View File

@@ -12,11 +12,27 @@ class Text;
class MenuOption;
class MenuRenderer; // <-- Nuevo
class ServiceMenu {
class ServiceMenu
{
public:
enum class Aspect { SHADOW, ALPHA };
enum class SettingsGroup { VIDEO, AUDIO, SETTINGS, SYSTEM, MAIN };
enum class GroupAlignment { CENTERED, LEFT };
enum class Aspect
{
SHADOW,
ALPHA
};
enum class SettingsGroup
{
VIDEO,
AUDIO,
SETTINGS,
SYSTEM,
MAIN
};
enum class GroupAlignment
{
CENTERED,
LEFT
};
// --- Constantes públicas que el Renderer podría necesitar ---
static constexpr size_t OPTIONS_HORIZONTAL_PADDING_ = 20;
@@ -25,11 +41,11 @@ public:
static void init();
static void destroy();
static ServiceMenu* get();
static ServiceMenu *get();
void toggle();
void render();
void update();
void render();
void update();
void reset();
// --- Lógica de navegación ---
@@ -38,16 +54,16 @@ public:
void adjustOption(bool adjust_up);
void selectOption();
void moveBack();
// --- Getters para que el Renderer pueda leer el estado ---
bool isEnabled() const { return enabled_; }
const std::string& getTitle() const { return title_; }
const std::string &getTitle() const { return title_; }
SettingsGroup getCurrentGroup() const { return current_settings_group_; }
GroupAlignment getCurrentGroupAlignment() const;
const std::vector<MenuOption*>& getDisplayOptions() const { return display_options_; }
const std::vector<std::unique_ptr<MenuOption>>& getAllOptions() const { return options_; }
const std::vector<MenuOption *> &getDisplayOptions() const { return display_options_; }
const std::vector<std::unique_ptr<MenuOption>> &getAllOptions() const { return options_; }
size_t getSelectedIndex() const { return selected_; }
const std::vector<std::pair<std::string, std::string>>& getOptionPairs() const { return option_pairs_; }
const std::vector<std::pair<std::string, std::string>> &getOptionPairs() const { return option_pairs_; }
size_t countOptionsInGroup(SettingsGroup group) const;
Aspect getAspect() const { return aspect_; }
@@ -55,9 +71,9 @@ private:
// --- Lógica de estado del menú (Modelo) ---
bool enabled_ = false;
std::vector<std::unique_ptr<MenuOption>> options_;
std::vector<MenuOption*> display_options_;
std::vector<MenuOption *> display_options_;
std::vector<std::pair<std::string, std::string>> option_pairs_;
SettingsGroup current_settings_group_;
SettingsGroup previous_settings_group_;
Aspect aspect_ = Aspect::ALPHA;
@@ -73,9 +89,15 @@ private:
std::unique_ptr<MenuRenderer> renderer_;
// --- Métodos de lógica interna ---
void updateDisplayOptions();
void updateOptionPairs();
void initializeOptions();
void updateMenu();
void applySettings();
void applyVideoSettings();
void applyAudioSettings();
void applySettingsSettings();
MenuOption *getOptionByCaption(const std::string &caption) const;
void AdjustListValues();
void playMenuSound();
std::string settingsGroupToString(SettingsGroup group) const;
@@ -83,7 +105,7 @@ private:
// --- Singleton ---
ServiceMenu();
~ServiceMenu() = default;
ServiceMenu(const ServiceMenu&) = delete;
ServiceMenu& operator=(const ServiceMenu&) = delete;
static ServiceMenu* instance_;
ServiceMenu(const ServiceMenu &) = delete;
ServiceMenu &operator=(const ServiceMenu &) = delete;
static ServiceMenu *instance_;
};