--- a/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp	Thu Aug 19 10:48:02 2010 +0300
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiRosterImpl.cpp	Tue Aug 31 16:07:35 2010 +0300
@@ -500,20 +500,13 @@
         // some other part of the effect, so this workaround won't work correctly in those cases. 
         // To get those working, propably whole opacity effect handling should be re-written 
         // differently.
-        CHuiRosterImpl* nonconst = const_cast<CHuiRosterImpl*>(this);
-        nonconst->Effectable()->EffectSetOpacityAdditive(0.0f, ETrue);
-        // PrepareDraw will update iEffectOpacity to correct opacity for this effect frame
-        if(iEffect->PrepareDrawL(aGc, displayRect))
+        if (iEffect->IsSemitransparent() || iEffectOpacity < 1.f)
             {
-            if (iEffectOpacity < 1.f)
-                {
-                iEffect->ForceCachedRenderTargetUsage(ETrue);
-                }        
-
-            RRegion dummy;
-            didDrawEffect = iEffect->CachedDraw(aGc, displayRect, refreshCache, opaque, dummy, EFalse, iEffectOpacity*255);        
-            dummy.Close();
-            }
+            iEffect->ForceCachedRenderTargetUsage(ETrue);
+            }        
+        RRegion dummy;
+        didDrawEffect = iEffect->CachedDraw(aGc, displayRect, refreshCache, opaque, dummy, EFalse, iEffectOpacity*255);        
+        dummy.Close();
         }
     
     if (!didDrawEffect)
@@ -1838,12 +1831,12 @@
     SetChanged();
     }
 
-TReal32 CHuiRosterImpl::EffectOpacity() const
+TReal32 CHuiRosterImpl::EffectOpacityTarget() const
     {
     return iEffectOpacity; 
     }
 
-void CHuiRosterImpl::EffectSetOpacityAdditive(TReal32 aOpacity, TBool /*aReplace*/)
+void CHuiRosterImpl::EffectSetOpacity(TReal32 aOpacity)
     {
     iEffectOpacity = aOpacity;
     }
@@ -1884,11 +1877,6 @@
     return iIsInput1;
     }
 
-TBool CHuiRosterImpl::EffectReadyToDrawNextFrame() const
-    {
-    return ETrue;
-    }
-
 void CHuiRosterImpl::SetMemoryLevel(THuiMemoryLevel /*aLevel*/)
     {
     if ( IsVisibleContentFrozen() && !UseRenderBufferForFreeze() )