X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=96866923f568b7ce713e939fe8ea500e1391c3b2;hb=b23fa507a8526ada698b2eb7e38987aa076ac79f;hp=8ed3c86874d8eb99e4024b6937d769220275bdca;hpb=5929a63f952cdedaec13f056d04062c34b566105;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 8ed3c868..96866923 100644
--- a/render/render.c
+++ b/render/render.c
@@ -30,13 +30,10 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
 
     resized = (l->w != w || l->h != h);
 
-    if (resized) {
-        oldp = l->pixmap; /* save to free after changing the visible pixmap */
-        l->pixmap = XCreatePixmap(RrDisplay(l->inst),
-                                  RrRootWindow(l->inst),
-                                  w, h, RrDepth(l->inst));
-    } else
-        oldp = None;
+    oldp = l->pixmap; /* save to free after changing the visible pixmap */
+    l->pixmap = XCreatePixmap(RrDisplay(l->inst),
+                              RrRootWindow(l->inst),
+                              w, h, RrDepth(l->inst));
 
     g_assert(l->pixmap != None);
     l->w = w;
@@ -56,8 +53,8 @@ void RrPaint(RrAppearance *l, Window win, gint w, gint h)
         g_assert (l->surface.parent->w);
 
         sw = l->surface.parent->w;
-        source = (l->surface.parent->surface.RrPixel_data + l->surface.parentx +
-                  sw * l->surface.parenty);
+        source = (l->surface.parent->surface.RrPixel_data +
+                  l->surface.parentx + sw * l->surface.parenty);
         dest = l->surface.RrPixel_data;
         for (i = 0; i < h; i++, source += sw, dest += w) {
             memcpy(dest, source, w * sizeof(RrPixel32));
@@ -266,13 +263,9 @@ void RrMinsize(RrAppearance *l, gint *w, gint *h)
             break;
         case RR_TEXTURE_TEXT:
             m = RrFontMeasureString(l->texture[i].data.text.font,
-                                    l->texture[i].data.text.string,
-                                    l->texture[i].data.text.shadow,
-                                    l->texture[i].data.text.offset);
+                                    l->texture[i].data.text.string);
             *w = MAX(*w, m);
-            m = RrFontHeight(l->texture[i].data.text.font,
-                             l->texture[i].data.text.shadow,
-                             l->texture[i].data.text.offset);
+            m = RrFontHeight(l->texture[i].data.text.font);
             *h += MAX(*h, m);
             break;
         case RR_TEXTURE_RGBA: