/*
- * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
this->role = j["role"];
this->name = j["name"];
this->layer_id = j["layer_id"];
- this->rect = genivi::full_rect;
+ this->rect = compositor::full_rect;
if (j["area"]["type"] == "rect") {
auto jr = j["area"]["rect"];
- this->rect = genivi::rect{
+ this->rect = compositor::rect{
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),
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) {
j.value("layer_id", -1), layer(j));
});
- // XXX: add sanity checks here?
+ // TODO: add sanity checks here?
// * check for double IDs
// * check for double names/roles
}
json layer::to_json() const {
- auto is_full = this->rect == genivi::full_rect;
+ auto is_full = this->rect == compositor::full_rect;
json r{};
if (is_full) {