From: Dana Jansens <danakj@orodu.net>
Date: Sun, 10 Jun 2007 03:58:17 +0000 (+0000)
Subject: merge r7472 from trunk
X-Git-Tag: release-3.4.3~81
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=24541163aedc16e18ef398ba431cccf47f302c27;p=dana%2Fopenbox.git

merge r7472 from trunk
---

diff --git a/openbox/frame.c b/openbox/frame.c
index 16057f17..eba679a9 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1632,10 +1632,11 @@ void frame_end_iconify_animation(ObFrame *self)
 
     if (!self->visible)
         XUnmapWindow(ob_display, self->window);
-    else
+    else {
         /* Send a ConfigureNotify when the animation is done, this fixes
            KDE's pager showing the window in the wrong place. */
         client_reconfigure(self->client);
+    }
 
     /* we're not animating any more ! */
     self->iconify_animation_going = 0;
@@ -1643,6 +1644,8 @@ void frame_end_iconify_animation(ObFrame *self)
     XMoveResizeWindow(ob_display, self->window,
                       self->area.x, self->area.y,
                       self->area.width, self->area.height);
+    /* we delay re-rendering until after we're done animating */
+    framerender_frame(self);
     XFlush(ob_display);
 }
 
diff --git a/openbox/framerender.c b/openbox/framerender.c
index b5cdf174..a02567bd 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -34,6 +34,9 @@ static void framerender_close(ObFrame *self, RrAppearance *a);
 
 void framerender_frame(ObFrame *self)
 {
+    if (frame_iconify_animating(self))
+        return; /* delay redrawing until the animation is done */
+
     {
         gulong px;