aboutsummaryrefslogtreecommitdiffstats
path: root/src/layers.cpp
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2017-10-23 23:39:52 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-11-01 11:03:36 +0000
commit08b73681b0ea6206fc6dc96575ac3e8d6006bc70 (patch)
tree0739ec377065cf3ca32e0b8fb85272dbefa9d4f0 /src/layers.cpp
parent02eef0a7cff4ede60d1434e860cd4bc9e163af56 (diff)
Modify the waiting loop of the ivi configuration listener
When layout is NOT normal, wait for the listener. Change-Id: Iedbb5de7a997c82613a0e1947d91ee2527f28436 Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r--src/layers.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/layers.cpp b/src/layers.cpp
index 2150440..fe95495 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -37,8 +37,16 @@ layer::layer(nlohmann::json const &j) {
jr["width"], jr["height"], jr["x"], jr["y"],
};
}
+
+ // Init flag of normal layout only
+ this->is_normal_layout_only = true;
+
auto split_layouts = j.find("split_layouts");
if (split_layouts != j.end()) {
+
+ // Clear flag of normal layout only
+ this->is_normal_layout_only = false;
+
auto &sls = j["split_layouts"];
// this->layouts.reserve(sls.size());
std::transform(std::cbegin(sls), std::cend(sls),
@@ -53,6 +61,8 @@ layer::layer(nlohmann::json const &j) {
return l;
});
}
+ HMI_DEBUG("wm", "layer_id:%d is_normal_layout_only:%d\n",
+ this->layer_id, this->is_normal_layout_only);
}
struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {