* Remplac� DrawRectangleRelief par DrawPolygonRelief.

2 files changed, 19 insertions, 15 deletions

diff --git a/generic/Item.c b/generic/Item.c
index 7210729..f587278 100644
--- a/generic/Item.c
+++ b/generic/Item.c
@@ -3987,8 +3987,18 @@ DrawFields(FieldSet	field_set)
        * Draw the border relief.
        */
       if ((field_ptr->relief != RELIEF_FLAT) && (field_ptr->relief_thickness > 1)) {
-	DrawRectangleRelief(wi, field_ptr->relief, field_ptr->gradient,
-			    &r, (unsigned int) field_ptr->relief_thickness);
+	ZnPoint p[5];
+	p[0].x = r.x;
+	p[0].y = r.y;
+	p[1].x = p[0].x;
+	p[1].y = p[0].y + r.height;
+	p[2].x = p[1].x + r.width;
+	p[2].y = p[1].y;
+	p[3].x = p[2].x;
+	p[3].y = p[0].y;
+	p[4] = p[0];
+	DrawPolygonRelief(wi, field_ptr->relief, field_ptr->gradient,
+			  p, 5, field_ptr->relief_thickness);
       }
 
       /*
diff --git a/generic/Rectangle.c b/generic/Rectangle.c
index 8306bc4..ab91e3e 100644
--- a/generic/Rectangle.c
+++ b/generic/Rectangle.c
@@ -548,20 +548,14 @@ Draw(Item	item)
   /* Draw the outline */
   if (rect->line_width) {
     if (rect->relief != RELIEF_FLAT) {
-      if (aligned) {
-	DrawRectangleRelief(wi, rect->relief, rect->gradient,
-			    &r, rect->line_width);
-      }
-      else {
-	ZnPoint p[5];
-	for (i = 0; i < 4; i++) {
-	  p[4-i].x = rect->dev[i].x;
-	  p[4-i].y = rect->dev[i].y;
-	}
-	p[0] = p[4];
-	DrawPolygonRelief(wi, rect->relief, rect->gradient,
-			  p, 5, rect->line_width);
+      ZnPoint p[5];
+      for (i = 0; i < 4; i++) {
+	p[4-i].x = rect->dev[i].x;
+	p[4-i].y = rect->dev[i].y;
       }
+      p[0] = p[4];
+      DrawPolygonRelief(wi, rect->relief, rect->gradient,
+			p, 5, rect->line_width);
     }
     else {
       SetLineStyle(wi->dpy, wi->gc, rect->line_style);