Code Review
/
apps
/
agl-service-windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix copyright to TOYOTA
[apps/agl-service-windowmanager.git]
/
src
/
layers.cpp
diff --git
a/src/layers.cpp
b/src/layers.cpp
index
2150440
..
30828dd
100644
(file)
--- a/
src/layers.cpp
+++ b/
src/layers.cpp
@@
-1,5
+1,5
@@
/*
/*
- * 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-30,15
+30,23
@@
layer::layer(nlohmann::json const &j) {
this->role = j["role"];
this->name = j["name"];
this->layer_id = j["layer_id"];
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"];
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"],
};
}
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) {
@@
-124,7
+134,7
@@
optional<int> layer_map::get_layer_id(std::string const &role) {
}
json layer::to_json() const {
}
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) {
json r{};
if (is_full) {