X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=8c39fcd249d0a1e86dcae115a500e2ab2fe97747;hb=564b727966ef1a38309d45b2ab040c3deeb658a4;hp=df47d6dbe8f3d7d234bce61e9a41a192da399412;hpb=a79651294c54a784b34c85e3832e8c7ca4f3aa17;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index df47d6db..8c39fcd2 100644
--- a/render/render.c
+++ b/render/render.c
@@ -2,7 +2,7 @@
 
    render.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
    Copyright (c) 2003        Derek Foreman
 
    This program is free software; you can redistribute it and/or modify
@@ -52,6 +52,14 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
         /* ob_debug("Invalid parent co-ordinates\n"); */
         return None;
     }
+
+    if (a->surface.grad == RR_SURFACE_PARENTREL &&
+        (a->surface.parentx >= a->surface.parent->w ||
+         a->surface.parenty >= a->surface.parent->h))
+    {
+        return None;
+    }
+
     resized = (a->w != w || a->h != h);
 
     oldp = a->pixmap; /* save to free after changing the visible pixmap */
@@ -79,10 +87,6 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
         sw = a->surface.parent->w;
         sh = a->surface.parent->h;
 
-        if (a->surface.parentx >= sw || a->surface.parenty >= sh) {
-            return oldp;
-        }
-
         source = (a->surface.parent->surface.pixel_data +
                   a->surface.parentx + sw * a->surface.parenty);
         dest = a->surface.pixel_data;