root_scratchpad_remove_container: do not show

This removes the call to `root_scratchpad_show` from
`root_scratchpad_remove_container` and places it in the
`cmd_move_container`. This also moved the IPC `window::move` event to
`cmd_scratchpad`.

1 files changed, 0 insertions, 7 deletions

diff --git a/sway/tree/root.c b/sway/tree/root.c
index ec6bccf6..c4d1145d 100644
--- a/sway/tree/root.c
+++ b/sway/tree/root.c
@@ -85,9 +85,6 @@ void root_scratchpad_remove_container(struct sway_container *con) {
         if (!sway_assert(con->scratchpad, "Container is not in scratchpad")) {
                 return;
         }
-        if (!con->workspace) {
-                root_scratchpad_show(con);
-        }
         con->scratchpad = false;
         int index = list_find(root->scratchpad, con);
         if (index != -1) {
@@ -133,10 +130,6 @@ void root_scratchpad_show(struct sway_container *con) {
 
         arrange_workspace(new_ws);
         seat_set_focus(seat, seat_get_focus_inactive(seat, &con->node));
-
-        if (new_ws != old_ws) {
-                ipc_event_window(con, "move");
-        }
 }
 
 void root_scratchpad_hide(struct sway_container *con) {