_urgent = false;
// not positioned unless specified
_positioned = false;
+ // nothing is disabled unless specified
+ _disabled_decorations = 0;
getArea();
getDesktop();
_decorations &= ~Decor_Close;
changeAllowedActions();
+
+ if (frame) {
+ frame->adjustSize(); // change the decors on the frame
+ frame->adjustPosition(); // with more/less decorations, we may need to be
+ // moved
+ }
}
_strut.right = data[1];
_strut.top = data[2];
_strut.bottom = data[3];
-
- openbox->screen(_screen)->updateStrut();
+
+ // updating here is pointless while we're being mapped cuz we're not in
+ // the screen's client list yet
+ if (frame)
+ openbox->screen(_screen)->updateStrut();
}
delete [] data;
getType();
calcLayer(); // type may have changed, so update the layer
setupDecorAndFunctions();
- frame->adjustSize(); // this updates the frame for any new decor settings
}
else if (e.atom == otk::Property::atoms.net_wm_name ||
e.atom == otk::Property::atoms.wm_name)
else if (e.atom == otk::Property::atoms.wm_protocols) {
updateProtocols();
setupDecorAndFunctions();
- frame->adjustSize(); // update the decorations
}
else if (e.atom == otk::Property::atoms.net_wm_strut)
updateStrut();
{
_disabled_decorations = flags;
setupDecorAndFunctions();
- if (frame)
- frame->adjustSize(); // change the decors on the frame
}
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)