system-controller: pass the updated layer id in set_window_layer.
authorJan Ekström <jan.ekstrom@intel.com>
Fri, 28 Nov 2014 13:05:54 +0000 (15:05 +0200)
committerKrisztian Litkey <krisztian.litkey@intel.com>
Thu, 8 Jan 2015 16:37:20 +0000 (18:37 +0200)
We were never updating the layer in the resulting window update,
and thus not sending the state back to HomeScreen. Additionally,
the resulting Murphy logging was misleading.

Change-Id: I188ec27c51eab8dec2c9706639f67db4dafea589

src/plugins/system-controller/wayland/glm-window-manager.c

index f190b86..f50694c 100644 (file)
@@ -2860,10 +2860,17 @@ static bool set_window_layer(mrp_wayland_window_t *win,
     if (changed) {
         memset(&u2, 0, sizeof(u2));
         u2.mask = MRP_WAYLAND_WINDOW_SURFACEID_MASK |
+                  MRP_WAYLAND_WINDOW_LAYER_MASK |
                   MRP_WAYLAND_WINDOW_RAISE_MASK;
         u2.surfaceid = win->surfaceid;
+        u2.layer = u->layer;
         u2.raise = 1;
 
+        mrp_debug("calling mrp_wayland_window_update(surface=%s, layer=%d,"
+                  "raise=%d)", surface_id_print(u2.surfaceid,
+                                                buf, sizeof(buf)),
+                  u2.layer, u2.raise);
+
         mrp_wayland_window_update(win, MRP_WAYLAND_WINDOW_VISIBLE, &u2);
     }