mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-28 01:52:29 -06:00
ui_settings: Place definition of the theme array within the cpp file
Placing the array wholesale into the header places a copy of the whole array into every translation unit that uses the data, which is wasteful. Particularly given that this array is referenced from three different translation units. This also changes the array to contain pairs of const char*, rather than QString instances. This way, the string data is able to be fixed into the read-only segment of the program, as well as eliminate static constructors/heap allocation immediately on program start.
This commit is contained in:
parent
b4b8c58f91
commit
365d8c57c7
3 changed files with 12 additions and 7 deletions
|
@ -31,7 +31,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
|
||||||
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
|
||||||
&ConfigureGeneral::onLanguageChanged);
|
&ConfigureGeneral::onLanguageChanged);
|
||||||
|
|
||||||
for (auto theme : UISettings::themes) {
|
for (const auto& theme : UISettings::themes) {
|
||||||
ui->theme_combobox->addItem(theme.first, theme.second);
|
ui->theme_combobox->addItem(theme.first, theme.second);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,5 +6,13 @@
|
||||||
|
|
||||||
namespace UISettings {
|
namespace UISettings {
|
||||||
|
|
||||||
|
const Themes themes{{
|
||||||
|
{"Default", "default"},
|
||||||
|
{"Dark", "qdarkstyle"},
|
||||||
|
{"Colorful", "colorful"},
|
||||||
|
{"Colorful Dark", "colorful_dark"},
|
||||||
|
}};
|
||||||
|
|
||||||
Values values = {};
|
Values values = {};
|
||||||
}
|
|
||||||
|
} // namespace UISettings
|
||||||
|
|
|
@ -16,11 +16,8 @@ namespace UISettings {
|
||||||
using ContextualShortcut = std::pair<QString, int>;
|
using ContextualShortcut = std::pair<QString, int>;
|
||||||
using Shortcut = std::pair<QString, ContextualShortcut>;
|
using Shortcut = std::pair<QString, ContextualShortcut>;
|
||||||
|
|
||||||
static const std::array<std::pair<QString, QString>, 4> themes = {
|
using Themes = std::array<std::pair<const char*, const char*>, 4>;
|
||||||
{std::make_pair(QString("Default"), QString("default")),
|
extern const Themes themes;
|
||||||
std::make_pair(QString("Dark"), QString("qdarkstyle")),
|
|
||||||
std::make_pair(QString("Colorful"), QString("colorful")),
|
|
||||||
std::make_pair(QString("Colorful Dark"), QString("colorful_dark"))}};
|
|
||||||
|
|
||||||
struct GameDir {
|
struct GameDir {
|
||||||
QString path;
|
QString path;
|
||||||
|
|
Loading…
Reference in a new issue