fix when 1or2px splitvertical

[chaz/openbox] / render / gradient.c

diff --git a/render/gradient.c b/render/gradient.c
index d32d9c81f396166d2fd01a41236a12068451531c..c9e9b03d71c56a910d747dcb350e573a502c6b16 100644 (file)
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -420,13 +420,15 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
 
 static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
 {
-    gint x, y1, y3, r, g, b;
+    gint x, y1, y2, y3, r, g, b;
     RrSurface *sf = &a->surface;
     RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
     RrColor *primary_light, *secondary_light;
+    gint y1sz, y2sz, y3sz;
 
     VARS(y1);
+    VARS(y2);
     VARS(y3);
 
     r = sf->primary->r;
@@ -451,19 +453,35 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
     if (b > 0xFF) b = 0xFF;
     secondary_light = RrColorNew(a->inst, r, g, b);
 
-    SETUP(y1, primary_light, sf->primary, (h / 2) -1);
-    SETUP(y3, sf->secondary, secondary_light,  (h / 2) -1);
+    y1sz = MAX(h/2 - 1, 1);
+    /* setup to get the colors _in between_ these other 2 */
+    y2sz = (h < 3 ? 0 : (h % 2 ? 3 : 2));
+    y3sz = MAX(h/2 - 1, 0);
 
-    for (y1 = h - 1; y1 > (h / 2) -1; --y1) {  /* 0 -> h-1 */
+    SETUP(y1, primary_light, sf->primary, y1sz);
+    if (y2sz) {
+        SETUP(y2, sf->primary, sf->secondary, y2sz);
+        NEXT(y2); /* skip the first one, its the same as the last of y1 */
+    }
+    SETUP(y3, sf->secondary, secondary_light,  y3sz);
+
+    for (y1 = y1sz; y1 > 0; --y1) {
         current = COLOR(y1);
-        for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+        for (x = w - 1; x >= 0; --x)
             *(data++) = current;
 
         NEXT(y1);
     }
 
+    for (y2 = y2sz; y2 > 0; --y2) {
+        current = COLOR(y2);
+        for (x = w - 1; x >= 0; --x)
+            *(data++) = current;
+        
+        NEXT(y2);
+    }
     
-    for (y3 = (h / 2) - 1; y3 > 0; --y3) {
+    for (y3 = y3sz; y3 > 0; --y3) {
         current = COLOR(y3);
         for (x = w - 1; x >= 0; --x)
             *(data++) = current;
@@ -471,10 +489,6 @@ static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
         NEXT(y3);
     }
 
-    current = COLOR(y3);
-    for (x = w - 1; x >= 0; --x)  /* 0 -> w */
-        *(data++) = current;
-
     RrColorFree(primary_light);
     RrColorFree(secondary_light);
 }