equal
deleted
inserted
replaced
555 } |
555 } |
556 } |
556 } |
557 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
557 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
558 { |
558 { |
559 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
559 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
560 iCanvasGc->SetPenColor(iWsPenColor); |
560 iCanvasGc->SetPenColor(iWsBrushColor); |
561 iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f)); |
561 iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f)); |
562 UseBrushPattern(); |
562 UseBrushPattern(); |
563 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
563 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
564 iCanvasGc->DrawRoundRect( THuiRealRect(aRect), THuiRealSize( aPoint.iX*2, aPoint.iY*2 )); |
564 iCanvasGc->DrawRoundRect( THuiRealRect(aRect), THuiRealSize( aPoint.iX*2, aPoint.iY*2 )); |
565 DiscardBrushPattern(); |
565 DiscardBrushPattern(); |
566 |
566 |
729 } |
729 } |
730 } |
730 } |
731 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
731 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
732 { |
732 { |
733 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
733 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
734 iCanvasGc->SetPenColor(iWsPenColor); |
734 iCanvasGc->SetPenColor(iWsBrushColor); |
735 iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f)); |
735 iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f)); |
736 UseBrushPattern(); |
736 UseBrushPattern(); |
737 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
737 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
738 iCanvasGc->DrawEllipse(destRect); |
738 iCanvasGc->DrawEllipse(destRect); |
739 DiscardBrushPattern(); |
739 DiscardBrushPattern(); |
740 |
740 |
879 } |
879 } |
880 } |
880 } |
881 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
881 else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush) |
882 { |
882 { |
883 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
883 iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd ); |
884 iCanvasGc->SetPenColor(iWsPenColor); |
884 iCanvasGc->SetPenColor(iWsBrushColor); |
885 iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f)); |
885 iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f)); |
886 UseBrushPattern(); |
886 UseBrushPattern(); |
887 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
887 iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode)); |
888 iCanvasGc->DrawRects(rects); |
888 iCanvasGc->DrawRects(rects); |
889 DiscardBrushPattern(); |
889 DiscardBrushPattern(); |
890 |
890 |