Some bitmap bugfixes

Fixed parameters to XFillRectangle, remoced old debug code.

diff --git a/src/Basemenu.cc b/src/Basemenu.cc
index 4cddaa97d09b403d6f08da561d742393cbeadbb8..e54ef19cfd7044e935579d591b7d0a6c01e4119a 100644 (file)
--- a/src/Basemenu.cc
+++ b/src/Basemenu.cc
@@ -627,7 +627,6 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
       XSetClipMask(blackbox->getXDisplay(), pen.gc(),
                    style->tick_image.mask);
 
-      cout << oppsel_x << ' ' << sel_x << endl;
       XFillRectangle(blackbox->getXDisplay(), menu.frame, pen.gc(),
                      oppsel_x, item_y + menu.item_h/2 - style->tick_image.h/2,
                      style->tick_image.w,
@@ -681,8 +680,7 @@ void Basemenu::drawItem(int index, bool highlight, bool clear,
 
       XFillRectangle(blackbox->getXDisplay(), menu.frame, pen.gc(),
                      sel_x, item_y + menu.item_h/2 - style->bullet_image.h/2,
-                     sel_x + style->bullet_image.w,
-                     item_y + menu.item_h/2 + style->bullet_image.h/2);
+                     style->bullet_image.w, style->bullet_image.h);
 
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
       

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 8c2325b5c58c7da014b097482f5e270e43d12232..d7dc36a412284e6db8afd53b719733f58a3a0653 100644 (file)
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -651,8 +651,7 @@ void Toolbar::drawArrow(Drawable surface, bool left) const {
       XFillRectangle(blackbox->getXDisplay(), surface, pen.gc(),
                      (frame.button_w - style->left_button.w)/2,
                      (frame.button_w - style->left_button.h)/2,
-                     (frame.button_w + style->left_button.w)/2,
-                     (frame.button_w + style->left_button.h)/2);
+                     style->left_button.w, style->left_button.h);
 
       XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
       XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);

diff --git a/src/Window.cc b/src/Window.cc
index 5245a6428ca5541aaa813a28339ca8a8fabfbc75..8a1b56845fb563206adcac1e5526f4fb1d6d4b03 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2628,7 +2628,7 @@ void BlackboxWindow::redrawIconifyButton(bool pressed) const {
 
     XFillRectangle(blackbox->getXDisplay(), frame.iconify_button, pen.gc(),
                    (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
-                   (frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
+                   pm.w, pm.h);
 
     XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
     XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);
@@ -2679,7 +2679,7 @@ void BlackboxWindow::redrawMaximizeButton(bool pressed) const {
 
     XFillRectangle(blackbox->getXDisplay(), frame.maximize_button, pen.gc(),
                    (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
-                   (frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
+                   pm.w, pm.h);
     
     XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );
     XSetClipMask( blackbox->getXDisplay(), pen.gc(), None );
@@ -2767,7 +2767,7 @@ void BlackboxWindow::redrawStickyButton(bool pressed) const {
     
     XFillRectangle(blackbox->getXDisplay(), frame.stick_button, pen.gc(),
                    (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2,
-                   (frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2);
+                   pm.w, pm.h);
 
   
     XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );