X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fbuttonwidget.cc;h=eb864ba23827208ec219cbfc6b93596acc4c604f;hb=ff3bb7566b76ff28e72e64054908145854b4454d;hp=53a7ffd501a025e1d3a7e3921d7fa16a4d7a4fc7;hpb=e64d90be4d5b86a497ed8f03c6ba40512765e239;p=chaz%2Fopenbox

diff --git a/src/buttonwidget.cc b/src/buttonwidget.cc
index 53a7ffd5..eb864ba2 100644
--- a/src/buttonwidget.cc
+++ b/src/buttonwidget.cc
@@ -77,19 +77,12 @@ void ButtonWidget::setStyle(otk::RenderStyle *style)
 }
 
 
-void ButtonWidget::update()
-{
-  printf("ButtonWidget::update()\n");
-  otk::Widget::update();
-}
-
 void ButtonWidget::renderForeground()
 {
   otk::PixmapMask *pm;
   int width;
   bool draw = _dirty;
 
-  printf("ButtonWidget::renderForeground()\n");
   otk::Widget::renderForeground();
 
   if (draw) {
@@ -113,6 +106,7 @@ void ButtonWidget::renderForeground()
       assert(false); // there's no other button widgets!
     }
 
+    assert(pm->mask);
     if (pm->mask == None) return; // no mask for the button, leave it empty
 
     width = _rect.width();
@@ -121,14 +115,13 @@ void ButtonWidget::renderForeground()
                                _style->buttonUnfocusColor());
 
     // set the clip region
+    int x = (width - pm->w) / 2, y = (width - pm->h) / 2;
     XSetClipMask(**otk::display, color->gc(), pm->mask);
-    XSetClipOrigin(**otk::display, color->gc(),
-                   (width - pm->w)/2, (width - pm->h)/2);
+    XSetClipOrigin(**otk::display, color->gc(), x, y);
 
     // fill in the clipped region
-    XFillRectangle(**otk::display, _window, color->gc(),
-                   (width - pm->w)/2, (width - pm->h)/2,
-                   (width + pm->w)/2, (width + pm->h)/2);
+    XFillRectangle(**otk::display, _surface->pixmap(), color->gc(), x, y,
+                   x + pm->w, y + pm->h);
 
     // unset the clip region
     XSetClipMask(**otk::display, color->gc(), None);