nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some bitmap bugfixes

Browse source 
Fixed parameters to XFillRectangle, remoced old debug code.
This commit is contained in:
Scott Moynes 2002-09-14 04:01:20 +00:00
parent d947f35db6
commit 01732a20db
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Basemenu.cc
View file

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

3
src/Toolbar.cc
View file

@ -651,8 +651,7 @@ void Toolbar::drawArrow(Drawable surface, bool left) const {
XFillRectangle(blackbox->getXDisplay(), surface, pen.gc(), XFillRectangle(blackbox->getXDisplay(), surface, pen.gc(),
(frame.button_w - style->left_button.w)/2, (frame.button_w - style->left_button.w)/2,
(frame.button_w - style->left_button.h)/2, (frame.button_w - style->left_button.h)/2,
(frame.button_w + style->left_button.w)/2, style->left_button.w, style->left_button.h);
(frame.button_w + style->left_button.h)/2);
XSetClipMask(blackbox->getXDisplay(), pen.gc(), None); XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0); XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0);

6
src/Window.cc
View file

@ -2628,7 +2628,7 @@ void BlackboxWindow::redrawIconifyButton(bool pressed) const {
XFillRectangle(blackbox->getXDisplay(), frame.iconify_button, pen.gc(), 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,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2); pm.w, pm.h);
XSetClipMask(blackbox->getXDisplay(), pen.gc(), None); XSetClipMask(blackbox->getXDisplay(), pen.gc(), None);
XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0); 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(), 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,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2); pm.w, pm.h);
XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 ); XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );
XSetClipMask( blackbox->getXDisplay(), pen.gc(), None ); XSetClipMask( blackbox->getXDisplay(), pen.gc(), None );
@ -2767,7 +2767,7 @@ void BlackboxWindow::redrawStickyButton(bool pressed) const {
XFillRectangle(blackbox->getXDisplay(), frame.stick_button, pen.gc(), 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,
(frame.button_w + pm.w)/2, (frame.button_w + pm.h)/2); pm.w, pm.h);
XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 ); XSetClipOrigin(blackbox->getXDisplay(), pen.gc(), 0, 0 );