add the FlatBorder texture type

diff --git a/src/Image.cc b/src/Image.cc
index d8f725a24547384a82d3542ae347d63ee55285b9..7aaeefaf160b20b38e228f3559f702db4382cba2 100644 (file)
--- a/src/Image.cc
+++ b/src/Image.cc
@@ -107,6 +107,11 @@ Pixmap BImage::render_solid(const BTexture &texture) {
       XDrawLine(display, pixmap, peninterlace.gc(), 0, i, width, i);
   }
 
+  if (texture.texture() & BTexture::FlatBorder) {
+    BPen penborder(texture.colorTo());
+    XDrawRectangle(display, pixmap, penborder.gc(), 0, 0, width-1, height-1);
+  }
+
   if (texture.texture() & BTexture::Bevel1) {
     if (texture.texture() & BTexture::Raised) {
       XDrawLine(display, pixmap, penshadow.gc(),

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

diff --git a/src/Texture.hh b/src/Texture.hh
index 1eed2c4280781fbb6d8e8a15302671e974b5a5a2..b0e2787ee6e0dde0ff24060c7d90e48e1e5aea57 100644 (file)
--- a/src/Texture.hh
+++ b/src/Texture.hh
@@ -35,29 +35,30 @@ public:
   enum Type {
     // bevel options
     Flat                = (1l<<0),
-    Sunken              = (1l<<1),
-    Raised              = (1l<<2),
+    FlatBorder          = (1l<<1),
+    Sunken              = (1l<<2),
+    Raised              = (1l<<3),
     // textures
-    Solid               = (1l<<3),
-    Gradient            = (1l<<4),
+    Solid               = (1l<<4),
+    Gradient            = (1l<<5),
     // gradients
-    Horizontal          = (1l<<5),
-    Vertical            = (1l<<6),
-    Diagonal            = (1l<<7),
-    CrossDiagonal       = (1l<<8),
-    Rectangle           = (1l<<9),
-    Pyramid             = (1l<<10),
-    PipeCross           = (1l<<11),
-    Elliptic            = (1l<<12),
+    Horizontal          = (1l<<6),
+    Vertical            = (1l<<7),
+    Diagonal            = (1l<<8),
+    CrossDiagonal       = (1l<<9),
+    Rectangle           = (1l<<10),
+    Pyramid             = (1l<<11),
+    PipeCross           = (1l<<12),
+    Elliptic            = (1l<<13),
     // bevel types
-    Bevel1              = (1l<<13),
-    Bevel2              = (1l<<14),
+    Bevel1              = (1l<<14),
+    Bevel2              = (1l<<15),
     // inverted image
-    Invert              = (1l<<15),
+    Invert              = (1l<<16),
     // parent relative image
-    Parent_Relative     = (1l<<16),
+    Parent_Relative     = (1l<<17),
     // fake interlaced image
-    Interlaced          = (1l<<17)
+    Interlaced          = (1l<<18)
   };
 
   BTexture(const BaseDisplay * const _display = 0,