Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
app: use activate_surface() in surface_set_layout()
[staging/windowmanager.git]
/
src
/
app.cpp
diff --git
a/src/app.cpp
b/src/app.cpp
index
78dc7d9
..
4800d8c
100644
(file)
--- a/
src/app.cpp
+++ b/
src/app.cpp
@@
-313,10
+313,15
@@
void App::surface_set_layout(uint32_t surface_id) {
s->set_destination_rectangle(x, y, w, h);
// XXX: The main_surface will be visible regardless
s->set_destination_rectangle(x, y, w, h);
// XXX: The main_surface will be visible regardless
- s->set_visibility(
- surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
+
//
s->set_visibility(
+
//
surface_id == static_cast<unsigned>(this->layers.main_surface) ? 1 : 0);
this->controller->layers[layer_id]->add_surface(s.get());
this->controller->layers[layer_id]->add_surface(s.get());
+ if (surface_id == static_cast<unsigned>(this->layers.main_surface)) {
+ logdebug("Activating main_surface (%d)", surface_id);
+ this->activate_surface(surface_id);
+ }
+
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}
logdebug("Surface %u now on layer %u with rect { %d, %d, %d, %d }",
surface_id, layer_id, x, y, w, h);
}