tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): more sensible multi-bar include behavior

Browse Source
This commit is contained in:
Aleksei Bavshin
2021-09-14 12:16:37 +07:00
parent 8912bd3ed0
commit ccc60b4245
8 changed files with 28 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/config.hpp
View File

@ -28,7 +28,7 @@ class Config {
std::vector<Json::Value> getOutputConfigs(const std::string &name, const std::string &identifier);
private:
void setupConfig(const std::string &config_file, int depth);
void setupConfig(Json::Value &dst, const std::string &config_file, int depth);
void resolveConfigIncludes(Json::Value &config, int depth);
void mergeConfig(Json::Value &a_config_, Json::Value &b_config_);