diff options
Diffstat (limited to 'src/layers.cpp')
-rw-r--r-- | src/layers.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/layers.cpp b/src/layers.cpp index b931870..d0a769a 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -45,25 +45,24 @@ layer::layer(nlohmann::json const &j) { auto split_layouts = j.find("split_layouts"); if (split_layouts != j.end()) { auto &sls = j["split_layouts"]; - this->layouts.reserve(sls.size()); + // this->layouts.reserve(sls.size()); std::transform(std::cbegin(sls), std::cend(sls), - std::back_inserter(this->layouts), [](json const &sl) { - struct split_layout l {}; - l.name = sl["name"]; - l.main_match = sl["main_match"]; - l.sub_match = sl["sub_match"]; - l.prio = sl.value<int>("priority", 0); + std::back_inserter(this->layouts), [this](json const &sl) { + struct split_layout l { + sl["name"], sl["main_match"], sl["sub_match"], + sl.value<int>("priority", 0) + }; logdebug( - "Added split_layout \"%s\" (main: \"%s\") (sub: " - "\"%s\") (prio: %d)", + "layer %d add split_layout \"%s\" (main: \"%s\") (sub: " + "\"%s\") (prio: %d)", this->layer_id, l.name.c_str(), l.main_match.c_str(), l.sub_match.c_str(), l.prio); return l; }); - std::sort(std::begin(this->layouts), std::end(this->layouts), - [](struct split_layout const &a, struct split_layout const &b) { - return a.prio < b.prio; - }); + //std::sort(std::begin(this->layouts), std::end(this->layouts), + // [](struct split_layout const &a, struct split_layout const &b) { + // return a.prio < b.prio; + // }); } } |