} else {
bool can_split = this->can_split(state, *surface_id);
- if (state.sub == -1) {
if (can_split) {
this->try_layout(
state,
this->surface_set_layout(state.main, surface_id);
this->activate(*surface_id);
+ if (state.sub != -1) {
+ this->deactivate(state.sub);
+ }
state = nl;
this->layout_commit();
this->surface_set_layout(*surface_id);
this->deactivate(state.main);
this->activate(*surface_id);
- this->deactivate(state.sub);
+ if (state.sub != -1) {
+ this->deactivate(state.sub);
+ }
state = nl;
this->layout_commit();
this->enqueue_flushdraw(state.main);
});
}
- }
}
// no error
}
void App::activate(int id) {
- if (this->controller->sprops[id].visibility == 0) {
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end() && ip->second.visibility == 0) {
this->controller->surfaces[id]->set_visibility(1);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();
}
void App::deactivate(int id) {
- if (this->controller->sprops[id].visibility != 0) {
+ auto ip = this->controller->sprops.find(id);
+ if (ip != this->controller->sprops.end() && ip->second.visibility != 0) {
this->controller->surfaces[id]->set_visibility(0);
char const *label =
this->lookup_name(id).value_or("unknown-name").c_str();