Merge branch 'master' into fullscreen-apps

way-cooler · Jan 8, 2017 · 20efd2a · 20efd2a
2 parents cfab65f + 31929e3
commit 20efd2a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/layout/commands.rs b/src/layout/commands.rs
@@ -302,7 +302,8 @@ impl Tree {
             return Err(TreeError::NoActiveContainer)
         }
         view.set_mask(output.get_mask());
-        if view.get_type() != ViewType::empty() {
+        let has_parent = view.get_parent() != WlcView::root();
+        if view.get_type() != ViewType::empty() || has_parent {
             try!(tree.add_floating_view(view));
         } else {
             try!(tree.add_view(view));