X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fstyle.cc;h=f0aeddabc9d08cc57ac7e7115fc20fdbc4062571;hb=bc88d310fea71823fb2c61d071ff499579bffaba;hp=fe34bbf41ec1c5e92f931e6470e2b5ac63f761ab;hpb=8bae1352cb401b71575106051a35a9535db1a7cd;p=chaz%2Fopenbox diff --git a/otk/style.cc b/otk/style.cc index fe34bbf4..f0aeddab 100644 --- a/otk/style.cc +++ b/otk/style.cc @@ -179,6 +179,12 @@ void Style::readDatabaseMask(const std::string &rname, PixmapMask &pixmapMask, ret = XReadBitmapFile(OBDisplay::display, root_window, expandTilde(xbmFile).c_str(), &pixmapMask.w, &pixmapMask.h, &pixmapMask.mask, &hx, &hy); + if (ret != BitmapSuccess) { + xbmFile = std::string(BUTTONSDIR) + "/" + s; + ret = XReadBitmapFile(OBDisplay::display, root_window, + xbmFile.c_str(), &pixmapMask.w, + &pixmapMask.h, &pixmapMask.mask, &hx, &hy); + } } else ret = XReadBitmapFile(OBDisplay::display, root_window, expandTilde(s).c_str(), &pixmapMask.w,