X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=5576094e8e761bde077f061d3a6bbc8c3017967a;hb=26700fa20abefccb77bb586b49b1629bf102e131;hp=89c2097f99dcdcd4ff854b9aabeebe0a45912fb5;hpb=8033c46081b93f19843d140e58b527af7abf7a4f;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index 89c2097..5576094 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -581,9 +581,12 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 			return;
 		}
 
-		if (!surf->ivi->activate_by_default && !surf->xwayland.is_set) {
-			weston_log("Refusing to activate surface role %d, app_id %s\n",
-					surf->role, app_id);
+		if (!surf->ivi->activate_by_default &&
+		    (!surf->xwayland.is_set && !is_shell_surface_xwayland(surf))) {
+			weston_log("Refusing to activate surface role %d, app_id %s, type %s\n",
+					surf->role, app_id,
+					is_shell_surface_xwayland(surf) ?
+					"xwayland" : "regular");
 
 			if (!weston_desktop_surface_get_maximized(dsurf) ||
 			    geom.width != r_output->area.width ||
@@ -611,7 +614,7 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
 				 */
 				weston_log("Surface no app_id, role %s activating by default\n",
 					ivi_layout_get_surface_role_name(surf));
-				if (surf->xwayland.is_set) {
+				if (surf->xwayland.is_set || is_shell_surface_xwayland(surf)) {
 					ivi_layout_activate_by_surf(r_output, surf);
 					ivi_layout_activate_complete(r_output, surf);
 				} else {