diff -r d5e927d5853b -r 7cee158cb8cd javauis/mmapi_akn/baseline/src/cmmadisplay.cpp --- a/javauis/mmapi_akn/baseline/src/cmmadisplay.cpp Tue Sep 14 21:06:50 2010 +0300 +++ b/javauis/mmapi_akn/baseline/src/cmmadisplay.cpp Wed Sep 15 12:05:25 2010 +0300 @@ -37,7 +37,7 @@ iClipRect.iTl.iX,iClipRect.iTl.iY); DEBUG_INT2("CMMADisplay::~CMMADisplay(): Removing clip rect iBr = %d X %d", iClipRect.iBr.iX,iClipRect.iBr.iY); - iDirectContainer->MdcRemoveContentBounds(iClipRect); + iDirectContainer->MdcRemoveMMAPIContentBounds(iClipRect); } // Remove this object from MDirectContainer @@ -162,7 +162,7 @@ if (!iClipRect.IsEmpty()) { DEBUG("CMMADisplay::SetClippingRegion: Removing old rect"); - iDirectContainer->MdcRemoveContentBounds(iClipRect); + iDirectContainer->MdcRemoveMMAPIContentBounds(iClipRect); iClipRect.SetRect(0, 0, 0, 0); refreshScreen = ETrue; } @@ -178,7 +178,7 @@ DEBUG_INT2("CMMADisplay::SetClippingRegion: Adding new rect iBr = %d X %d", iClipRect.iBr.iX,iClipRect.iBr.iY); // Add new clipping rect - iDirectContainer->MdcAddContentBounds(iClipRect); + iDirectContainer->MdcAddMMAPIContentBounds(iClipRect); refreshScreen = ETrue; } } @@ -204,7 +204,7 @@ if (!iClipRect.IsEmpty()) { DEBUG("CMMADisplay::RemoveClippingRegion: Removing old rect"); - iDirectContainer->MdcRemoveContentBounds(iClipRect); + iDirectContainer->MdcRemoveMMAPIContentBounds(iClipRect); iClipRect.SetRect(0, 0, 0, 0); // refresh screen iDirectContainer->MdcFlushContainer(iWindow->WindowRect()); @@ -246,7 +246,7 @@ DEBUG_INT2("CMMADisplay::AddClippingRegion: Adding new rect iBr = %d X %d", iClipRect.iBr.iX,iClipRect.iBr.iY); // Add new clipping rect - iDirectContainer->MdcAddContentBounds(iClipRect); + iDirectContainer->MdcAddMMAPIContentBounds(iClipRect); // refresh screen iDirectContainer->MdcFlushContainer( iWindow->WindowRect()); @@ -356,6 +356,11 @@ { DEBUG_INT("MID::CMMADisplay::MdcContainerVisibilityChanged aVisible = %d", aVisible); + + // aVisible true indicates that container is now in foreground, so + // set iContainerVisible which may be used in SetForeground(). + iContainerVisible = aVisible ? aVisible : iContainerVisible; + if (!iIsForeground && aVisible) { DEBUG("MID::CMMADisplay::MdcContainerVisibilityChanged Condition 1 "); @@ -452,6 +457,7 @@ if (iContainerVisible && !iWindow->IsVisible()) { iWindow->SetVisible(ETrue, aUseEventServer); + SetClippingRegion(); } } else @@ -509,4 +515,15 @@ } } + +void CMMADisplay::RemoveClippingRegionPublic() +{ + RemoveClippingRegion(); +} + +void CMMADisplay::SetClippingRegionPublic() +{ + SetClippingRegion(); +} + // END OF FILE