surface's have a size not a width()/height()

[chaz/openbox] / src / frame.cc

diff --git a/src/frame.cc b/src/frame.cc
index 2f0835eed9abef468c9b12e38c51d1e58f9175cb..6fedce49443fed8821aa2a480804cdb399e9127b 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -449,8 +449,10 @@ void Frame::renderLabel()
     src = _title_sur->pixelData() + w * (geom.bevel + 1) + geom.title_x;
     
     // get the background under the label
-    for (int y = 0; y < geom.button_size; ++y, src += w - geom.button_size)
-      for (int x = 0; x < geom.button_size; ++x, ++dest, ++src)
+    int xd = s->size().width();
+    int yd = s->size().height();
+    for (int y = 0; y < yd; ++y, src += w - xd)
+      for (int x = 0; x < xd; ++x, ++dest, ++src)
         *dest = *src;
     control->drawImage(*s, 0, 0, 0); // no image but draw the new background
   } else