equal
deleted
inserted
replaced
655 { |
655 { |
656 points.Append( THuiRealPoint( aPointerArray->At(j) + iWsOrigin + iPosDelta) ); |
656 points.Append( THuiRealPoint( aPointerArray->At(j) + iWsOrigin + iPosDelta) ); |
657 } |
657 } |
658 UseWsState(); |
658 UseWsState(); |
659 |
659 |
660 if ( aFillRule == MWsGraphicsContext::EAlternate ) |
660 if (iWsBrushStyle == MWsGraphicsContext::ENullBrush) |
661 { |
661 { |
662 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
662 // nullbrush, but pen style set |
663 } |
663 // -> draw non filled polygon and |
664 if ( aFillRule == MWsGraphicsContext::EWinding ) |
664 // use pencolor |
665 { |
665 iCanvasGc->SetPolygonDrawMode( EHuiNoFill ); |
666 iCanvasGc->SetPolygonDrawMode( EHuiFillNonZero ); |
666 iCanvasGc->SetPenColor(iWsPenColor); |
667 } |
667 iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f)); |
668 iCanvasGc->SetPenColor(iWsPenColor); |
668 |
669 iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f)); |
669 } |
|
670 else |
|
671 { |
|
672 if ( aFillRule == MWsGraphicsContext::EAlternate ) |
|
673 { |
|
674 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
|
675 } |
|
676 if ( aFillRule == MWsGraphicsContext::EWinding ) |
|
677 { |
|
678 iCanvasGc->SetPolygonDrawMode( EHuiFillNonZero ); |
|
679 } |
|
680 iCanvasGc->SetPenColor(iWsBrushColor); |
|
681 iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f)); |
|
682 } |
|
683 |
670 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
684 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
671 |
685 |
672 iCanvasGc->DrawPolygon( points ); |
686 iCanvasGc->DrawPolygon( points ); |
673 |
687 |
674 UseCanvasState(); |
688 UseCanvasState(); |