Nikolay Sivov : gdiplus: Add a helper to create gradient brush from rectangle.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6906117bc3d53dd9318a486b4e9cfd6dd5d1c77a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6906117bc3d53dd9318a486b4...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed Nov 14 13:40:55 2018 +0300

gdiplus: Add a helper to create gradient brush from rectangle.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/gdiplus/brush.c | 185 +++++++++++++++++++++++++++++----------------------
 1 file changed, 107 insertions(+), 78 deletions(-)

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 3aeb654..808e021 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -265,12 +265,49 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(GpHatchStyle hatchstyle, ARGB forecol,
     return Ok;
 }
 
-static void linegradient_init_transform(GpLineGradient *line)
+static GpStatus create_line_brush(const GpRectF *rect, ARGB startcolor, ARGB endcolor,
+    GpWrapMode wrap, GpLineGradient **line)
+{
+    *line = heap_alloc_zero(sizeof(GpLineGradient));
+    if(!*line)  return OutOfMemory;
+
+    (*line)->brush.bt = BrushTypeLinearGradient;
+    (*line)->startcolor = startcolor;
+    (*line)->endcolor = endcolor;
+    (*line)->wrap = wrap;
+    (*line)->gamma = FALSE;
+    (*line)->rect = *rect;
+    (*line)->blendcount = 1;
+    (*line)->blendfac = heap_alloc_zero(sizeof(REAL));
+    (*line)->blendpos = heap_alloc_zero(sizeof(REAL));
+
+    if (!(*line)->blendfac || !(*line)->blendpos)
+    {
+        heap_free((*line)->blendfac);
+        heap_free((*line)->blendpos);
+        heap_free(*line);
+        *line = NULL;
+        return OutOfMemory;
+    }
+
+    (*line)->blendfac[0] = 1.0f;
+    (*line)->blendpos[0] = 1.0f;
+
+    (*line)->pblendcolor = NULL;
+    (*line)->pblendpos = NULL;
+    (*line)->pblendcount = 0;
+
+    GdipSetMatrixElements(&(*line)->transform, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f);
+
+    return Ok;
+}
+
+static void linegradient_init_transform(const GpPointF *startpoint, const GpPointF *endpoint, GpLineGradient *line)
 {
     float trans_x = line->rect.X + (line->rect.Width / 2.f);
     float trans_y = line->rect.Y + (line->rect.Height / 2.f);
-    float dx = line->endpoint.X - line->startpoint.X;
-    float dy = line->endpoint.Y - line->startpoint.Y;
+    float dx = endpoint->X - startpoint->X;
+    float dy = endpoint->Y - startpoint->Y;
     float t_cos, t_sin, w_ratio, h_ratio;
     float h;
     GpMatrix rot;
@@ -307,6 +344,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint,
     GDIPCONST GpPointF* endpoint, ARGB startcolor, ARGB endcolor,
     GpWrapMode wrap, GpLineGradient **line)
 {
+    GpStatus stat;
+    GpRectF rect;
+
     TRACE("(%s, %s, %x, %x, %d, %p)\n", debugstr_pointf(startpoint),
           debugstr_pointf(endpoint), startcolor, endcolor, wrap, line);
 
@@ -316,57 +356,27 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint,
     if (startpoint->X == endpoint->X && startpoint->Y == endpoint->Y)
         return OutOfMemory;
 
-    *line = heap_alloc_zero(sizeof(GpLineGradient));
-    if(!*line)  return OutOfMemory;
+    rect.X = startpoint->X < endpoint->X ? startpoint->X : endpoint->X;
+    rect.Y = startpoint->Y < endpoint->Y ? startpoint->Y : endpoint->Y;
+    rect.Width = fabs(startpoint->X - endpoint->X);
+    rect.Height = fabs(startpoint->Y - endpoint->Y);
 
-    (*line)->brush.bt = BrushTypeLinearGradient;
-
-    (*line)->startpoint.X = startpoint->X;
-    (*line)->startpoint.Y = startpoint->Y;
-    (*line)->endpoint.X = endpoint->X;
-    (*line)->endpoint.Y = endpoint->Y;
-    (*line)->startcolor = startcolor;
-    (*line)->endcolor = endcolor;
-    (*line)->wrap = wrap;
-    (*line)->gamma = FALSE;
-
-    (*line)->rect.X = (startpoint->X < endpoint->X ? startpoint->X: endpoint->X);
-    (*line)->rect.Y = (startpoint->Y < endpoint->Y ? startpoint->Y: endpoint->Y);
-    (*line)->rect.Width  = fabs(startpoint->X - endpoint->X);
-    (*line)->rect.Height = fabs(startpoint->Y - endpoint->Y);
-
-    if ((*line)->rect.Width == 0)
+    if (rect.Width == 0.0f)
     {
-        (*line)->rect.X -= (*line)->rect.Height / 2.0f;
-        (*line)->rect.Width = (*line)->rect.Height;
+        rect.X -= rect.Height / 2.0f;
+        rect.Width = rect.Height;
     }
-    else if ((*line)->rect.Height == 0)
+    else if (rect.Height == 0.0f)
     {
-        (*line)->rect.Y -= (*line)->rect.Width / 2.0f;
-        (*line)->rect.Height = (*line)->rect.Width;
-    }
-
-    (*line)->blendcount = 1;
-    (*line)->blendfac = heap_alloc_zero(sizeof(REAL));
-    (*line)->blendpos = heap_alloc_zero(sizeof(REAL));
-
-    if (!(*line)->blendfac || !(*line)->blendpos)
-    {
-        heap_free((*line)->blendfac);
-        heap_free((*line)->blendpos);
-        heap_free(*line);
-        *line = NULL;
-        return OutOfMemory;
+        rect.Y -= rect.Width / 2.0f;
+        rect.Height = rect.Width;
     }
 
-    (*line)->blendfac[0] = 1.0f;
-    (*line)->blendpos[0] = 1.0f;
-
-    (*line)->pblendcolor = NULL;
-    (*line)->pblendpos = NULL;
-    (*line)->pblendcount = 0;
+    stat = create_line_brush(&rect, startcolor, endcolor, wrap, line);
+    if (stat != Ok)
+        return stat;
 
-    linegradient_init_transform(*line);
+    linegradient_init_transform(startpoint, endpoint, *line);
 
     TRACE("<-- %p\n", *line);
 
@@ -474,9 +484,9 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect
     GpLineGradient **line)
 {
     GpStatus stat;
-    LinearGradientMode mode;
-    REAL exofs, eyofs;
+    REAL exofs, eyofs, far_x, far_y;
     REAL sin_angle, cos_angle, sin_cos_angle;
+    GpPointF start, end;
 
     TRACE("(%p, %x, %x, %.2f, %d, %d, %p)\n", rect, startcolor, endcolor, angle, isAngleScalable,
           wrap, line);
@@ -515,42 +525,61 @@ GpStatus WINGDIPAPI GdipCreateLineBrushFromRectWithAngle(GDIPCONST GpRectF* rect
     cos_angle = cosf(angle);
     sin_cos_angle = sin_angle * cos_angle;
 
-    if (sin_cos_angle >= 0)
-        mode = LinearGradientModeForwardDiagonal;
+    far_x = rect->X + rect->Width;
+    far_y = rect->Y + rect->Height;
+
+    if (angle == 0.0f)
+    {
+        start.X = min(rect->X, far_x);
+        start.Y = rect->Y;
+        end.X = max(rect->X, far_x);
+        end.Y = rect->Y;
+    }
+    else if (sin_cos_angle >= 0)
+    {
+        start.X = min(rect->X, far_x);
+        start.Y = min(rect->Y, far_y);
+        end.X = max(rect->X, far_x);
+        end.Y = max(rect->Y, far_y);
+    }
     else
-        mode = LinearGradientModeBackwardDiagonal;
+    {
+        start.X = max(rect->X, far_x);
+        start.Y = min(rect->Y, far_y);
+        end.X = min(rect->X, far_x);
+        end.Y = max(rect->Y, far_y);
+    }
 
-    stat = GdipCreateLineBrushFromRect(rect, startcolor, endcolor, mode, wrap, line);
+    stat = create_line_brush(rect, startcolor, endcolor, wrap, line);
+    if (stat != Ok || angle == 0.0f)
+        return stat;
 
-    if (stat == Ok)
+    if (sin_cos_angle >= 0)
     {
-        if (sin_cos_angle >= 0)
-        {
-            exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle;
-            eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle;
-        }
-        else
-        {
-            exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle;
-            eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle;
-        }
-
-        if (sin_angle >= 0)
-        {
-            (*line)->endpoint.X = rect->X + exofs;
-            (*line)->endpoint.Y = rect->Y + eyofs;
-        }
-        else
-        {
-            (*line)->endpoint.X = (*line)->startpoint.X;
-            (*line)->endpoint.Y = (*line)->startpoint.Y;
-            (*line)->startpoint.X = rect->X + exofs;
-            (*line)->startpoint.Y = rect->Y + eyofs;
-        }
+        exofs = rect->Height * sin_cos_angle + rect->Width * cos_angle * cos_angle;
+        eyofs = rect->Height * sin_angle * sin_angle + rect->Width * sin_cos_angle;
+    }
+    else
+    {
+        exofs = rect->Width * sin_angle * sin_angle + rect->Height * sin_cos_angle;
+        eyofs = -rect->Width * sin_cos_angle + rect->Height * sin_angle * sin_angle;
+    }
 
-        linegradient_init_transform(*line);
+    if (sin_angle >= 0)
+    {
+        end.X = rect->X + exofs;
+        end.Y = rect->Y + eyofs;
+    }
+    else
+    {
+        end.X = start.X;
+        end.Y = start.Y;
+        start.X = rect->X + exofs;
+        start.Y = rect->Y + eyofs;
     }
 
+    linegradient_init_transform(&start, &end, *line);
+
     return stat;
 }