summaryrefslogtreecommitdiffstats
path: root/src/layers.cpp
diff options
context:
space:
mode:
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-12 11:29:32 +0200
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>2017-09-12 11:29:32 +0200
commit7da386db79a2f10ce0a357a76001638ff3310b70 (patch)
treecbadbe7d28cf69dd7da4566b9fb19937a1c3427f /src/layers.cpp
parent4257992da317b5e641d6743b3efa1fadb546f33c (diff)
App/layers: deactivate surfaces on layers above.
* When activating a surface on layer x, all surfaces on all layers above this will be deactivated. * Remove main_surface special case (we get the same result by putting the main_surface on the bottom layer). * Track LayoutState per layer, make can_split() accept this layer-local LayoutState for its decision. * Sort layers on load according to their ID. That is, do not make use Of the layer's z-order attribute, also there is no need to. Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'src/layers.cpp')
-rw-r--r--src/layers.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/layers.cpp b/src/layers.cpp
index d0a769a..a0665b7 100644
--- a/src/layers.cpp
+++ b/src/layers.cpp
@@ -87,7 +87,8 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) {
return unsigned(k.layer_id);
});
- // XXX need to sort layers?
+ std::sort(stl.layers.begin(), stl.layers.end());
+
for (auto i : stl.mapping) {
if (i.name.empty()) {
return Err<struct layer_map>("Found mapping w/o name");