Code Review
/
apps
/
agl-service-windowmanager-2017.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Layer configuration file is included in widget
[apps/agl-service-windowmanager-2017.git]
/
src
/
layers.cpp
diff --git
a/src/layers.cpp
b/src/layers.cpp
index
2150440
..
fe95495
100644
(file)
--- 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"],
};
}
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()) {
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),
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;
});
}
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) {
}
struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {