sync with bb-cvs.

[chaz/openbox] / src / Texture.cc

diff --git a/src/Texture.cc b/src/Texture.cc
index 8f2731b6deb37f0ed3f19653479d8e28cd40e20d..87825267f2c269e0abcc602a2a150ac344c73dcc 100644 (file)
--- a/src/Texture.cc
+++ b/src/Texture.cc
@@ -128,12 +128,14 @@ void BTexture::setDescription(const string &d) {
 
     if (descr.find("sunken") != string::npos)
       addTexture(BTexture::Sunken);
+    else if (descr.find("flatborder") != string::npos)
+      addTexture(BTexture::FlatBorder);
     else if (descr.find("flat") != string::npos)
       addTexture(BTexture::Flat);
     else
       addTexture(BTexture::Raised);
 
-    if (! (texture() & BTexture::Flat)) {
+    if (! (texture() & (BTexture::Flat | BTexture::FlatBorder))) {
       if (descr.find("bevel2") != string::npos)
         addTexture(BTexture::Bevel2);
       else