fix scratchpad for sway

Author: Tony Crisci

i3ipc/con.py

@@ -415,30 +415,8 @@ def scratchpad(self) -> 'Con':
         :returns: The scratchpad container.
         :rtype: class:`Con`
         """
-        root = self.root()
+        for con in self.root():
+            if con.type == 'workspace' and con.name == "__i3_scratch":
+                return con
 
-        i3con = None
-        for c in root.nodes:
-            if c.name == "__i3":
-                i3con = c
-                break
-
-        if not i3con:
-            return None
-
-        i3con_content = None
-        for c in i3con.nodes:
-            if c.name == "content":
-                i3con_content = c
-                break
-
-        if not i3con_content:
-            return None
-
-        scratch = None
-        for c in i3con_content.nodes:
-            if c.name == "__i3_scratch":
-                scratch = c
-                break
-
-        return scratch
+        return None

test/aio/test_scratchpad.py

@@ -0,0 +1,18 @@
+from .ipctest import IpcTest
+
+import pytest
+
+
+class TestScratchpad(IpcTest):
+    @pytest.mark.asyncio
+    async def test_scratchpad(self, i3):
+        scratchpad = (await i3.get_tree()).scratchpad()
+        assert scratchpad is not None
+        assert scratchpad.name == '__i3_scratch'
+        assert scratchpad.type == 'workspace'
+        assert not scratchpad.floating_nodes
+        win = self.open_window()
+        await i3.command('move scratchpad')
+        scratchpad = (await i3.get_tree()).scratchpad()
+        assert scratchpad is not None
+        assert scratchpad.floating_nodes