gdiplus: Handle StringFormatFlagsNoWrap in GdipDrawString.
This commit is contained in:
parent
92aa57bece
commit
3f32083ed7
|
@ -1289,13 +1289,14 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
|
||||||
if(!graphics || !string || !font || !brush || !rect)
|
if(!graphics || !string || !font || !brush || !rect)
|
||||||
return InvalidParameter;
|
return InvalidParameter;
|
||||||
|
|
||||||
if(format || (brush->bt != BrushTypeSolidColor)){
|
if((brush->bt != BrushTypeSolidColor)){
|
||||||
FIXME("not implemented for given parameters\n");
|
FIXME("not implemented for given parameters\n");
|
||||||
if(format)
|
|
||||||
TRACE("format attr is %d\n", format->attr);
|
|
||||||
return NotImplemented;
|
return NotImplemented;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(format)
|
||||||
|
TRACE("may be ignoring some format flags: attr %x\n", format->attr);
|
||||||
|
|
||||||
if(length == -1) length = lstrlenW(string);
|
if(length == -1) length = lstrlenW(string);
|
||||||
|
|
||||||
stringdup = GdipAlloc(length * sizeof(WCHAR));
|
stringdup = GdipAlloc(length * sizeof(WCHAR));
|
||||||
|
@ -1402,6 +1403,10 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string
|
||||||
|
|
||||||
if(height > roundr(rect->Height * rel_height))
|
if(height > roundr(rect->Height * rel_height))
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* Stop if this was a linewrap (but not if it was a linebreak). */
|
||||||
|
if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap))
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
DeleteObject(rgn);
|
DeleteObject(rgn);
|
||||||
|
|
Loading…
Reference in New Issue