all repos — openbox @ 01732a20dbb6b75431dc34fbe8401bfca952f43a

openbox fork - make it a bit more like ryudo 

Some bitmap bugfixes
Fixed parameters to XFillRectangle, remoced old debug code.
Scott Moynes smoynes@nexus.carleton.ca
commit

01732a20dbb6b75431dc34fbe8401bfca952f43a

parent

d947f35db63d0dd89428836128ec2197148e5e7d

3 files changed, 5 insertions(+), 8 deletions(-)

jump to
M src/Basemenu.cc → src/Basemenu.cc 
@@ -627,7 +627,6 @@ oppsel_x, item_y + menu.item_h/2 - style->tick_image.h/2);
       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 @@ style->bullet_image.mask);
 
       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);
M src/Toolbar.cc → src/Toolbar.cc 
@@ -651,8 +651,7 @@ 
       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);
M src/Window.cc → src/Window.cc 
@@ -2628,7 +2628,7 @@ (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
 
     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 @@ (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
 
     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 @@ (frame.button_w - pm.w)/2, (frame.button_w - pm.h)/2);
     
     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 );