layout: State explicity the output

[src/agl-compositor.git] / src / layout.c

diff --git a/src/layout.c b/src/layout.c
index 5d24a1f..86b4b7f 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -285,14 +285,6 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
        struct ivi_compositor *ivi = surf->ivi;
        const char *app_id = weston_desktop_surface_get_app_id(dsurf);
 
-       weston_desktop_surface_set_maximized(dsurf, true);
-       weston_desktop_surface_set_size(dsurf,
-                                       ivi_output->area.width,
-                                       ivi_output->area.height);
-
-       weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
-                       app_id, ivi_layout_get_surface_role_name(surf),
-                       ivi_output->area.width, ivi_output->area.height);
        /*
         * If the view isn't mapped, we put it onto the hidden layer so it will
         * start receiving frame events, and will be able to act on our
@@ -302,6 +294,15 @@ ivi_layout_add_to_hidden_layer(struct ivi_surface *surf,
                ev->is_mapped = true;
                ev->surface->is_mapped = true;
 
+               weston_desktop_surface_set_maximized(dsurf, true);
+               weston_desktop_surface_set_size(dsurf,
+                                               ivi_output->area.width,
+                                               ivi_output->area.height);
+
+               weston_log("Setting app_id %s, role %s, set to maximized (%dx%d)\n",
+                               app_id, ivi_layout_get_surface_role_name(surf),
+                               ivi_output->area.width, ivi_output->area.height);
+
                weston_view_set_output(ev, ivi_output->output);
                weston_layer_entry_insert(&ivi->hidden.view_list, &ev->layer_link);
                weston_log("Placed app_id %s, type %s in hidden layer\n",
@@ -418,9 +419,11 @@ ivi_layout_desktop_committed(struct ivi_surface *surf)
                        return;
 
                if (app_id) {
-                       weston_log("Surface with app_id %s, role %s activating by default\n",
-                                       weston_desktop_surface_get_app_id(surf->dsurface),
-                                       ivi_layout_get_surface_role_name(surf));
+                       weston_log("Surface with app_id %s, role %s activating "
+                                  "by default on output %s\n",
+                                  weston_desktop_surface_get_app_id(surf->dsurface),
+                                  ivi_layout_get_surface_role_name(surf),
+                                  output->output->name);
                        ivi_layout_activate(output, app_id);
                }
                return;
@@ -795,8 +798,8 @@ ivi_layout_activate_by_surf(struct ivi_output *output, struct ivi_surface *surf)
        }
 
 #ifdef AGL_COMP_DEBUG
-       weston_log("Activating app_id %s, type %s\n", app_id,
-                       ivi_layout_get_surface_role_name(surf));
+       weston_log("Activating app_id %s, type %s, on output %s\n", app_id,
+                       ivi_layout_get_surface_role_name(surf), output->output->name);
 #endif
 
        if (surf->role == IVI_SURFACE_ROLE_POPUP) {