OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 04:10:07 +00:00
Code Issues Projects Releases Wiki Activity

ui_settings: Place definition of the theme array within the cpp file

Browse Source 
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:
Lioncash 2018-10-04 06:33:17 -04:00 committed by fearlessTobi
parent b4b8c58f91
commit 365d8c57c7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/configuration/configure_general.cpp
View File

@ -31,7 +31,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&ConfigureGeneral::onLanguageChanged);
for (auto theme : UISettings::themes) {
for (const auto& theme : UISettings::themes) {
ui->theme_combobox->addItem(theme.first, theme.second);
}

10
src/citra_qt/ui_settings.cpp
View File

@ -6,5 +6,13 @@
namespace UISettings {
const Themes themes{{
{"Default", "default"},
{"Dark", "qdarkstyle"},
{"Colorful", "colorful"},
{"Colorful Dark", "colorful_dark"},
}};
Values values = {};
}
} // namespace UISettings

7
src/citra_qt/ui_settings.h
View File

@ -16,11 +16,8 @@ namespace UISettings {
using ContextualShortcut = std::pair<QString, int>;
using Shortcut = std::pair<QString, ContextualShortcut>;
static const std::array<std::pair<QString, QString>, 4> themes = {
{std::make_pair(QString("Default"), QString("default")),
std::make_pair(QString("Dark"), QString("qdarkstyle")),
std::make_pair(QString("Colorful"), QString("colorful")),
std::make_pair(QString("Colorful Dark"), QString("colorful_dark"))}};
using Themes = std::array<std::pair<const char*, const char*>, 4>;
extern const Themes themes;
struct GameDir {
QString path;