Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
layout: Specify the reason for not activating windows
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
b3a7329
..
63ef9f9
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-1091,14
+1091,18
@@
ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
#endif
/* do not 're'-activate surfaces that are split or active */
#endif
/* do not 're'-activate surfaces that are split or active */
- if (surf == output->active ||
- ivi_layout_surface_is_split_or_fullscreen(surf) ||
- surf->role != IVI_SURFACE_ROLE_DESKTOP) {
+ if (surf == output->active) {
weston_log("Application %s is already active on output %s\n",
app_id, output->output->name);
return;
}
weston_log("Application %s is already active on output %s\n",
app_id, output->output->name);
return;
}
+ if (ivi_layout_surface_is_split_or_fullscreen(surf)) {
+ weston_log("Application %s is fullscreen or split on output %s\n",
+ app_id, output->output->name);
+ return;
+ }
+
// destroy any split types to allow correct re-activation
ivi_layout_reset_split_surfaces(surf->ivi);
// destroy any split types to allow correct re-activation
ivi_layout_reset_split_surfaces(surf->ivi);