Merge branch 'release-4.16.1'

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index be514ce20e259f6f5db222bfc9639474f8e3eb54..4833466cc5d902030fd598fa87b882fedf400955 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -59,7 +59,7 @@ static void floating_set_hint_atom(Con *con, bool floating) {
     xcb_flush(conn);
 }
 
-/**
+/*
  * Called when a floating window is created or resized.
  * This function resizes the window if its size is higher or lower than the
  * configured maximum/minimum size, respectively.
@@ -899,13 +899,16 @@ bool floating_reposition(Con *con, Rect newrect) {
 
     con->rect = newrect;
 
-    floating_maybe_reassign_ws(con);
+    bool reassigned = floating_maybe_reassign_ws(con);
 
     /* If this is a scratchpad window, don't auto center it from now on. */
     if (con->scratchpad_state == SCRATCHPAD_FRESH)
         con->scratchpad_state = SCRATCHPAD_CHANGED;
 
-    tree_render();
+    /* Workspace change will already result in a tree_render. */
+    if (!reassigned) {
+        tree_render();
+    }
     return true;
 }