Style::Style(BImageControl *ctrl)
: image_control(ctrl), font(0),
- screen_number(ctrl->getScreenInfo()->getScreenNumber())
+ screen_number(ctrl->getScreenInfo()->screen())
{
}
b_focus = readDatabaseTexture("window.button.focus", "white", style);
b_unfocus = readDatabaseTexture("window.button.unfocus", "black", style);
- b_pressed = readDatabaseTexture("window.button.pressed", "black", style);
//if neither of these can be found, we will use the previous resource
b_pressed_focus = readDatabaseTexture("window.button.pressed.focus",
"black", style, true);
+ if (b_pressed_focus.texture() == BTexture::NoTexture) {
+ b_pressed_focus = readDatabaseTexture("window.button.pressed", "black",
+ style);
+ }
+
b_pressed_unfocus = readDatabaseTexture("window.button.pressed.unfocus",
"black", style, true);
+ if (b_pressed_unfocus.texture() == BTexture::NoTexture) {
+ b_pressed_unfocus = readDatabaseTexture("window.button.pressed", "black",
+ style);
+ }
if (close_button.mask != None)
XFreePixmap(OBDisplay::display, close_button.mask);
// load bevel, border and handle widths
const ScreenInfo *s_info = OBDisplay::screenInfo(screen_number);
- unsigned int width = s_info->getRect().width();
+ unsigned int width = s_info->rect().width();
if (! style.getValue("handleWidth", handle_width) ||
handle_width > width/2 || handle_width == 0)
void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask,
const Configuration &style) {
- Window root_window = OBDisplay::screenInfo(screen_number)->getRootWindow();
+ Window root_window = OBDisplay::screenInfo(screen_number)->rootWindow();
std::string s;
int hx, hy; //ignored
int ret = BitmapOpenFailed; //default to failure.
- if (style.getValue(rname, s))
- {
- if (s[0] != '/' && s[0] != '~')
- {
+ if (style.getValue(rname, s)) {
+ if (s[0] != '/' && s[0] != '~') {
std::string xbmFile = std::string("~/.openbox/buttons/") + s;
ret = XReadBitmapFile(OBDisplay::display, root_window,
expandTilde(xbmFile).c_str(), &pixmapMask.w,
tint = atoi(s.c_str());
}
- fontstring = "Arial,Sans-8:bold";
+ fontstring = "Arial,Sans-9:bold";
// if this fails, it ::exit()'s
return new BFont(screen_number, fontstring, dropShadow, offset, tint);