GpLineGradient **line)
{
GpPointF start, end;
+ float far_x, angle;
GpStatus stat;
- float far_x, far_y;
TRACE("(%p, %x, %x, %d, %d, %p)\n", rect, startcolor, endcolor, mode,
wrap, line);
if(!line || !rect)
return InvalidParameter;
- far_x = rect->X + rect->Width;
- far_y = rect->Y + rect->Height;
-
switch (mode)
{
- case LinearGradientModeHorizontal:
- start.X = min(rect->X, far_x);
- start.Y = rect->Y;
- end.X = max(rect->X, far_x);
- end.Y = rect->Y;
- break;
case LinearGradientModeVertical:
- start.X = rect->X;
- start.Y = min(rect->Y, far_y);
- end.X = rect->X;
- end.Y = max(rect->Y, far_y);
+ angle = 90.0f;
break;
case LinearGradientModeForwardDiagonal:
- 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);
+ angle = 45.0f;
break;
case 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);
+ angle = 135.0f;
break;
+ case LinearGradientModeHorizontal:
+ far_x = rect->X + rect->Width;
+
+ start.X = min(rect->X, far_x);
+ start.Y = rect->Y;
+ end.X = max(rect->X, far_x);
+ end.Y = rect->Y;
+ stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line);
+ if (stat == Ok)
+ (*line)->rect = *rect;
+ return stat;
default:
return InvalidParameter;
}
- stat = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line);
-
- if (stat == Ok)
- (*line)->rect = *rect;
-
- return stat;
+ return GdipCreateLineBrushFromRectWithAngle(rect, startcolor, endcolor, angle, TRUE, wrap, line);
}
GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* 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);
cos_angle = cosf(angle);
sin_cos_angle = sin_angle * cos_angle;
+ far_x = rect->X + rect->Width;
+ far_y = rect->Y + rect->Height;
+
if (sin_cos_angle >= 0)
- mode = LinearGradientModeForwardDiagonal;
+ {
+ 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 = GdipCreateLineBrush(&start, &end, startcolor, endcolor, wrap, line);
if (stat == Ok)
{