shell/tiling: Fix render order

src/shell/layout/tiling/mod.rs

@@ -1155,6 +1155,30 @@ impl TilingLayout {
                         tree.traverse_pre_order(root)
                             .unwrap()
                             .filter(|node| node.data().is_mapped(None))
+                            .filter(|node| match node.data() {
+                                Data::Mapped { mapped, .. } => mapped.is_activated(),
+                                _ => unreachable!(),
+                            })
+                            .map(|node| match node.data() {
+                                Data::Mapped {
+                                    mapped,
+                                    last_geometry,
+                                    ..
+                                } => (
+                                    &output_data.output,
+                                    mapped,
+                                    output_data.location + last_geometry.loc,
+                                ),
+                                _ => unreachable!(),
+                            })
+                            .chain(
+                                tree.traverse_pre_order(root)
+                                    .unwrap()
+                                    .filter(|node| node.data().is_mapped(None))
+                                    .filter(|node| match node.data() {
+                                        Data::Mapped { mapped, .. } => !mapped.is_activated(),
+                                        _ => unreachable!(),
+                                    })
                                     .map(|node| match node.data() {
                                         Data::Mapped {
                                             mapped,
@@ -1167,6 +1191,7 @@ impl TilingLayout {
                                         ),
                                         _ => unreachable!(),
                                     }),
+                            ),
                     )
                 } else {
                     None
@@ -1257,11 +1282,32 @@ impl TilingLayout {
                 if &output_data.output != output {
                     return None;
                 }
-                let root = tree.root_node_id()?;
+
+                if let Some(root) = tree.root_node_id() {
                     Some(
                         tree.traverse_pre_order(root)
                             .unwrap()
                             .filter(|node| node.data().is_mapped(None))
+                            .filter(|node| match node.data() {
+                                Data::Mapped { mapped, .. } => mapped.is_activated(),
+                                _ => unreachable!(),
+                            })
+                            .map(|node| match node.data() {
+                                Data::Mapped {
+                                    mapped,
+                                    last_geometry,
+                                    ..
+                                } => (mapped, last_geometry.loc),
+                                _ => unreachable!(),
+                            })
+                            .chain(
+                                tree.traverse_pre_order(root)
+                                    .unwrap()
+                                    .filter(|node| node.data().is_mapped(None))
+                                    .filter(|node| match node.data() {
+                                        Data::Mapped { mapped, .. } => !mapped.is_activated(),
+                                        _ => unreachable!(),
+                                    })
                                     .map(|node| match node.data() {
                                         Data::Mapped {
                                             mapped,
@@ -1270,7 +1316,11 @@ impl TilingLayout {
                                         } => (mapped, last_geometry.loc),
                                         _ => unreachable!(),
                                     }),
+                            ),
                     )
+                } else {
+                    None
+                }
             })
             .flatten()
             .flat_map(|(mapped, loc)| {