From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Wed, 13 Sep 2017 10:48:07 +0000 (+0200)
Subject: layers: remove priority from split layout definition
X-Git-Tag: 4.99.1~14
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=commitdiff_plain;h=5710504a95125fdf504c80ca6c445218514633fb

layers: remove priority from split layout definition

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---

diff --git a/src/layers.cpp b/src/layers.cpp
index 5b28c15..9219766 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -43,20 +43,14 @@ layer::layer(nlohmann::json const &j) {
       std::transform(std::cbegin(sls), std::cend(sls),
                      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)
-                        };
+                           sl["name"], sl["main_match"], sl["sub_match"] };
                         logdebug(
                            "layer %d add split_layout \"%s\" (main: \"%s\") (sub: "
-                           "\"%s\") (prio: %d)", this->layer_id,
+                           "\"%s\")", this->layer_id,
                            l.name.c_str(), l.main_match.c_str(),
-                           l.sub_match.c_str(), l.prio);
+                           l.sub_match.c_str());
                         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;
-      //          });
    }
 }
 
diff --git a/src/layers.hpp b/src/layers.hpp
index 5d085a0..0603d24 100644
--- a/src/layers.hpp
+++ b/src/layers.hpp
@@ -33,7 +33,6 @@ struct split_layout {
    std::string name;
    std::string main_match;
    std::string sub_match;
-   int prio;  // no entirely sure we will use this
 };
 
 struct layer {