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

@@ -142,12 +142,8 @@ void ServiceMenu::moveBack()
// --- Lógica Interna --- // --- Lógica Interna ---
void ServiceMenu::updateMenu() void ServiceMenu::updateDisplayOptions()
{ {
title_ = settingsGroupToString(current_settings_group_);
AdjustListValues();
// Actualiza las opciones visibles
display_options_.clear(); display_options_.clear();
for (auto &option : options_) for (auto &option : options_)
{ {
@@ -156,13 +152,25 @@ void ServiceMenu::updateMenu()
display_options_.push_back(option.get()); display_options_.push_back(option.get());
} }
} }
updateOptionPairs();
}
// Actualiza los pares de strings para el renderer void ServiceMenu::updateOptionPairs()
{
option_pairs_.clear(); option_pairs_.clear();
for (const auto &option : display_options_) for (const auto &option : display_options_)
{ {
option_pairs_.emplace_back(option->getCaption(), option->getValueAsString()); option_pairs_.emplace_back(option->getCaption(), option->getValueAsString());
} }
}
void ServiceMenu::updateMenu()
{
title_ = settingsGroupToString(current_settings_group_);
AdjustListValues();
// Actualiza las opciones visibles
updateDisplayOptions();
// Notifica al renderer del cambio de layout // Notifica al renderer del cambio de layout
renderer_->onLayoutChanged(this); renderer_->onLayoutChanged(this);
@@ -171,28 +179,49 @@ void ServiceMenu::updateMenu()
void ServiceMenu::applySettings() void ServiceMenu::applySettings()
{ {
if (current_settings_group_ == SettingsGroup::VIDEO) if (current_settings_group_ == SettingsGroup::VIDEO)
Screen::get()->applySettings(); applyVideoSettings();
if (current_settings_group_ == SettingsGroup::AUDIO) if (current_settings_group_ == SettingsGroup::AUDIO)
Audio::get()->applySettings(); applyAudioSettings();
if (current_settings_group_ == SettingsGroup::SETTINGS) if (current_settings_group_ == SettingsGroup::SETTINGS)
applySettingsSettings();
// Actualiza los valores de las opciones
updateOptionPairs();
}
void ServiceMenu::applyVideoSettings()
{ {
for (auto &option : options_) Screen::get()->applySettings();
auto option = getOptionByCaption(Lang::getText("[SERVICE_MENU] WINDOW_SIZE"));
if (option)
option->setHidden(Options::video.fullscreen);
updateMenu(); // El menú debe refrescarse si algo se oculta
}
void ServiceMenu::applyAudioSettings()
{ {
if (option->getCaption() == Lang::getText("[SERVICE_MENU] SHUTDOWN]")) Audio::get()->applySettings();
}
void ServiceMenu::applySettingsSettings()
{ {
auto option = getOptionByCaption(Lang::getText("[SERVICE_MENU] SHUTDOWN"));
if (option)
option->setHidden(!Options::settings.shutdown_enabled); option->setHidden(!Options::settings.shutdown_enabled);
updateMenu(); // El menú debe refrescarse si algo se oculta updateMenu(); // El menú debe refrescarse si algo se oculta
break;
} }
}
} MenuOption *ServiceMenu::getOptionByCaption(const std::string &caption) const
// Refresca los pares de strings por si un valor cambió
option_pairs_.clear();
for (const auto &option : display_options_)
{ {
option_pairs_.emplace_back(option->getCaption(), option->getValueAsString()); for (const auto &option : options_)
{
if (option->getCaption() == caption)
{
return option.get();
} }
} }
return nullptr;
}
// --- Getters y otros --- // --- Getters y otros ---

View File

@@ -12,11 +12,27 @@ class Text;
class MenuOption; class MenuOption;
class MenuRenderer; // <-- Nuevo class MenuRenderer; // <-- Nuevo
class ServiceMenu { class ServiceMenu
{
public: public:
enum class Aspect { SHADOW, ALPHA }; enum class Aspect
enum class SettingsGroup { VIDEO, AUDIO, SETTINGS, SYSTEM, MAIN }; {
enum class GroupAlignment { CENTERED, LEFT }; SHADOW,
ALPHA
};
enum class SettingsGroup
{
VIDEO,
AUDIO,
SETTINGS,
SYSTEM,
MAIN
};
enum class GroupAlignment
{
CENTERED,
LEFT
};
// --- Constantes públicas que el Renderer podría necesitar --- // --- Constantes públicas que el Renderer podría necesitar ---
static constexpr size_t OPTIONS_HORIZONTAL_PADDING_ = 20; static constexpr size_t OPTIONS_HORIZONTAL_PADDING_ = 20;
@@ -73,9 +89,15 @@ private:
std::unique_ptr<MenuRenderer> renderer_; std::unique_ptr<MenuRenderer> renderer_;
// --- Métodos de lógica interna --- // --- Métodos de lógica interna ---
void updateDisplayOptions();
void updateOptionPairs();
void initializeOptions(); void initializeOptions();
void updateMenu(); void updateMenu();
void applySettings(); void applySettings();
void applyVideoSettings();
void applyAudioSettings();
void applySettingsSettings();
MenuOption *getOptionByCaption(const std::string &caption) const;
void AdjustListValues(); void AdjustListValues();
void playMenuSound(); void playMenuSound();
std::string settingsGroupToString(SettingsGroup group) const; std::string settingsGroupToString(SettingsGroup group) const;