- Create the XLateObj between background and brush color

- Allows hatched brush colors to show
- Edit a FIXME: a bitmap is not a brush information

svn path=/trunk/; revision=37269
This commit is contained in:
Gregor Schneider 2008-11-09 22:02:46 +00:00
parent 8a50f7448d
commit f05d09c4b3

View file

@ -62,12 +62,12 @@ BRUSH_GetObject (PGDIBRUSHOBJ BrushObject, INT Count, LPLOGBRUSH Buffer)
if (Count == 0) return 0; if (Count == 0) return 0;
/* Set colour */ /* Set colour */
Buffer->lbColor = BrushObject->BrushAttr.lbColor; Buffer->lbColor = BrushObject->BrushAttr.lbColor;
/* set Hatch */ /* set Hatch */
if ((BrushObject->flAttrs & GDIBRUSH_IS_HATCH)!=0) if ((BrushObject->flAttrs & GDIBRUSH_IS_HATCH)!=0)
{ {
/* FIXME : is this right value */ /* FIXME : this is not the right value */
Buffer->lbHatch = (LONG)BrushObject->hbmPattern; Buffer->lbHatch = (LONG)BrushObject->hbmPattern;
} }
else else
@ -153,7 +153,7 @@ IntGdiCreateBrushXlate(PDC Dc, GDIBRUSHOBJ *BrushObj, BOOLEAN *Failed)
if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr; if (!Dc_Attr) Dc_Attr = &Dc->Dc_Attr;
if (Dc->w.bitsPerPixel != 1) if (Dc->w.bitsPerPixel != 1)
Result = IntEngCreateSrcMonoXlate(hPalette, Dc_Attr->crForegroundClr, Dc_Attr->crBackgroundClr); Result = IntEngCreateSrcMonoXlate(hPalette, BrushObj->BrushAttr.lbColor, Dc_Attr->crBackgroundClr);
} }
else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB) else if (BrushObj->flAttrs & GDIBRUSH_IS_DIB)
{ {