uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp
branchRCL_3
changeset 7 88b23e2e82e1
parent 6 10534483575f
child 10 7c5dd702d6d3
--- a/uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp	Mon Mar 15 12:43:37 2010 +0200
+++ b/uiacceltk/hitchcock/coretoolkit/src/huicanvaswshwgc.cpp	Wed Mar 31 23:03:58 2010 +0300
@@ -557,8 +557,8 @@
         else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush)
             {
             iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd );
-            iCanvasGc->SetPenColor(iWsPenColor);                    
-            iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f));       
+            iCanvasGc->SetPenColor(iWsBrushColor);                    
+            iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f));       
             UseBrushPattern();
             iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode));        
             iCanvasGc->DrawRoundRect( THuiRealRect(aRect), THuiRealSize( aPoint.iX*2, aPoint.iY*2 ));
@@ -731,8 +731,8 @@
         else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush)
             {
             iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd );
-            iCanvasGc->SetPenColor(iWsPenColor);                    
-            iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f));       
+            iCanvasGc->SetPenColor(iWsBrushColor);                    
+            iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f));       
             UseBrushPattern();
             iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode));        
             iCanvasGc->DrawEllipse(destRect);
@@ -881,8 +881,8 @@
         else if (iWsBrushStyle == MWsGraphicsContext::EPatternedBrush)
             {
             iCanvasGc->SetPolygonDrawMode( EHuiFillEvenOdd );
-            iCanvasGc->SetPenColor(iWsPenColor);                    
-            iCanvasGc->SetOpacity(TReal32(iWsPenColor.Alpha() / 255.f));       
+            iCanvasGc->SetPenColor(iWsBrushColor);                    
+            iCanvasGc->SetOpacity(TReal32(iWsBrushColor.Alpha() / 255.f));       
             UseBrushPattern();
             iCanvasGc->SetDrawMode(SelectCanvasDrawMode(iWsDrawMode));        
             iCanvasGc->DrawRects(rects);