From: Dana Jansens Date: Thu, 14 Feb 2008 19:44:17 +0000 (-0500) Subject: backport the changes to render/ from the alttab branch (commit 3592046b2b26e05ee94c0d... X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=512d93afcc3e7dd5caa42cdb69508964c6338f3d;p=chaz%2Fopenbox backport the changes to render/ from the alttab branch (commit 3592046b2b26e05ee94c0dd0fed5b7fd5475c198) in master, as the iconcache changes depend on this git show 3592046b -- render --- diff --git a/render/render.c b/render/render.c index 2813dda0..b81e80a6 100644 --- a/render/render.c +++ b/render/render.c @@ -132,10 +132,20 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) break; case RR_TEXTURE_RGBA: g_assert(!transferred); - RrImageDraw(a->surface.pixel_data, - &a->texture[i].data.rgba, - a->w, a->h, - &tarea); + { + RrRect narea = tarea; + RrTextureRGBA *rgb = &a->texture[i].data.rgba; + if (rgb->twidth) + narea.width = MIN(tarea.width, rgb->twidth); + if (rgb->theight) + narea.height = MIN(tarea.height, rgb->theight); + narea.x += rgb->tx; + narea.y += rgb->ty; + RrImageDraw(a->surface.pixel_data, + &a->texture[i].data.rgba, + a->w, a->h, + &narea); + } force_transfer = 1; break; } diff --git a/render/render.h b/render/render.h index d9438edc..10eafc6e 100644 --- a/render/render.h +++ b/render/render.h @@ -167,6 +167,11 @@ struct _RrTextureRGBA { gint cwidth; gint cheight; RrPixel32 *cache; +/* size and position to draw at */ + gint tx; + gint ty; + gint twidth; + gint theight; }; struct _RrTextureLineArt {