labels are higher than buttons too

[chaz/openbox] / src / frame.cc

diff --git a/src/frame.cc b/src/frame.cc
index cabad297e60016f1b03531c7066e708c76ba1fbe..d846692e0eb3417466343e8e3d5d8ab75b639bc0 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -446,11 +446,11 @@ void Frame::renderLabel()
     otk::pixel32 *dest = s->pixelData(), *src;
     int w = _title_sur->size().width();
   
-    src = _title_sur->pixelData() + w * (geom.bevel + 1) + geom.title_x;
+    src = _title_sur->pixelData() + w * geom.bevel + geom.title_x;
     
     // get the background under the label
-    int xd = s->width();
-    int yd = s->height();
+    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;