Quick refactor of the config system to make it easier to refactor config.cpp/hpp later.
This commit is contained in:
parent
47f659ae8e
commit
e523aa8b02
29 changed files with 138 additions and 140 deletions
|
|
@ -47,7 +47,7 @@ namespace sfml {
|
|||
|
||||
guecs::Theme Backend::theme() {
|
||||
palette::init();
|
||||
auto config = Config("assets/config.json")["theme"];
|
||||
auto config = settings::Config("assets/config.json")["theme"];
|
||||
|
||||
guecs::Theme theme {
|
||||
.BLACK=palette::get("gui/theme:black"),
|
||||
|
|
@ -71,7 +71,7 @@ namespace sfml {
|
|||
theme.BG_COLOR = palette::get("gui/theme:bg_color");
|
||||
theme.BORDER_COLOR = palette::get("gui/theme:border_color");
|
||||
theme.BG_COLOR_DARK = palette::get("gui/theme:bg_color_dark");
|
||||
theme.FONT_FILE_NAME = Config::path_to(config["font_file_name"]).string();
|
||||
theme.FONT_FILE_NAME = settings::Config::path_to(config["font_file_name"]).string();
|
||||
|
||||
return theme;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue