Return DRAG_ABORT on UnmapNotify from drag_pointer

[i3/i3] / src / scratchpad.c

diff --git a/src/scratchpad.c b/src/scratchpad.c
index ce3d9b9ba3c38b4b8c31605707f9805ad776400c..17df77dde624804e642a0934c9157a06bef07e18 100644 (file)
--- a/src/scratchpad.c
+++ b/src/scratchpad.c
@@ -66,7 +66,13 @@ void scratchpad_move(Con *con) {
      * adjusted in size according to what the user specifies. */
     if (con->scratchpad_state == SCRATCHPAD_NONE) {
         DLOG("This window was never used as a scratchpad before.\n");
-        con->scratchpad_state = SCRATCHPAD_FRESH;
+        if (con == maybe_floating_con) {
+            DLOG("It was in floating mode before, set scratchpad state to changed.\n");
+            con->scratchpad_state = SCRATCHPAD_CHANGED;
+        } else {
+            DLOG("It was in tiling mode before, set scratchpad state to fresh.\n");
+            con->scratchpad_state = SCRATCHPAD_FRESH;
+        }
     }
 }