int width; // the width of the client and its border
int bwidth; // width to make borders
int cbwidth; // width of the inner client border
- int butsize=0; // width and height of the titlebar buttons
+ int fontheight = _style->labelFont()->height(); // height of the font
+ int butsize = fontheight - 2; // width and height of the titlebar buttons
const int bevel = _style->bevelWidth();
if (_decorations & Client::Decor_Border) {
_innersize.top += _titlebar.height() + bwidth;
// set the label size
- _label.setGeometry(0, bevel, width, _style->labelFont()->height());
+ _label.setGeometry(0, bevel, width, fontheight);
// set the buttons sizes
- butsize = _label.height() - 2;
if (_decorations & Client::Decor_Iconify)
_button_iconify.setGeometry(0, bevel + 1, butsize, butsize);
if (_decorations & Client::Decor_Maximize)
void Frame::grabClient()
{
// reparent the client to the frame
- XReparentWindow(**otk::display, _client->window(),
- _plate.window(), 0, 0);
+ XReparentWindow(**otk::display, _client->window(), _plate.window(), 0, 0);
/*
When reparenting the client window, it is usually not mapped yet, since
this occurs from a MapRequest. However, in the case where Openbox is
if (openbox->state() == Openbox::State_Starting)
_client->ignore_unmaps += 2;
- // select the event mask on the client's parent (to receive config req's)
- XSelectInput(**otk::display, _plate.window(),
- SubstructureRedirectMask);
+ // select the event mask on the client's parent (to receive config/map req's)
+ XSelectInput(**otk::display, _plate.window(), SubstructureRedirectMask);
// map the client so it maps when the frame does
XMapWindow(**otk::display, _client->window());