The removed code was add by commit 61b8a62 to fix #564. That bug is cause
by rendering the mplayer window again as a floating window (even if it
has been rendered before as a fullscreen window, at line 202). So simply
checking for fullscreen window is enough to solve this problem. Treating
floating/tiling fullscreen window differently is not needed.
---
 src/render.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/render.c b/src/render.c
index 01628c3..fb5b1ab 100644
--- a/src/render.c
+++ b/src/render.c
@@ -254,26 +254,13 @@ void render_con(Con *con, bool render_fullscreen) {
             Con *content = output_get_content(output);
             Con *workspace = TAILQ_FIRST(&(content->focus_head));

-            /* Check for (floating!) fullscreen nodes */
+            /* Check for fullscreen nodes */
/* XXX: This code duplication is unfortunate. Keep in mind to fix
              * this when we clean up the whole render.c */
             Con *fullscreen = NULL;
             fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
-            if (fullscreen) {
-                /* Either the fullscreen window is inside the floating
-                 * container, then we need to render and raise it now… */
-                if (con_inside_floating(fullscreen)) {
-                    fullscreen->rect = output->rect;
-                    x_raise_con(fullscreen);
-                    render_con(fullscreen, true);
+            if (fullscreen)
                     continue;
-                } else {
- /* …or it’s a tiling window, in which case the floating - * windows should not overlap it, so we skip rendering this
-                     * output. */
-                    continue;
-                }
-            }

             Con *child;
TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
--
1.7.12


--
Using Opera's revolutionary email client: http://www.opera.com/mail/

Attachment: 0001-remove-unnecessary-code-in-render_con.patch
Description: Binary data

Reply via email to