diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-11 19:02:11 -0500 |
| commit | acafa38c8ea210b12ed92fc16281b915ab61542c (patch) | |
| tree | ce4c7d2a4a9b3478a4d48af2c54ada06593ed022 /render/render.c | |
| parent | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (diff) | |
| parent | 9ba2b04e96449fea5b6bd212aa3d431638754bdd (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
Diffstat (limited to 'render/render.c')
| -rw-r--r-- | render/render.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/render/render.c b/render/render.c index 7c00c146..20002e32 100644 --- a/render/render.c +++ b/render/render.c @@ -135,12 +135,14 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) { RrRect narea = tarea; RrTextureImage *img = &a->texture[i].data.image; - if (img->twidth) - narea.width = MIN(tarea.width, img->twidth); - if (img->theight) - narea.height = MIN(tarea.height, img->theight); narea.x += img->tx; + narea.width -= img->tx; narea.y += img->ty; + narea.height -= img->ty; + if (img->twidth) + narea.width = MIN(narea.width, img->twidth); + if (img->theight) + narea.height = MIN(narea.height, img->theight); RrImageDrawImage(a->surface.pixel_data, &a->texture[i].data.image, a->w, a->h, @@ -153,12 +155,14 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h) { 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.width -= rgb->tx; narea.y += rgb->ty; + narea.height -= rgb->ty; + if (rgb->twidth) + narea.width = MIN(narea.width, rgb->twidth); + if (rgb->theight) + narea.height = MIN(narea.height, rgb->theight); RrImageDrawRGBA(a->surface.pixel_data, &a->texture[i].data.rgba, a->w, a->h, |