--- a/javauis/lcdui_akn/javalcdui/src/CMIDToolkit.cpp Wed Sep 15 12:05:25 2010 +0300
+++ b/javauis/lcdui_akn/javalcdui/src/CMIDToolkit.cpp Wed Oct 13 14:23:59 2010 +0300
@@ -598,39 +598,16 @@
if (appUi && appUi->hasStartScreen())
{
MMIDComponent* content = iCurrentDisplayable ? iCurrentDisplayable->Component() : NULL;
-
- TBool isCanvas = EFalse;
- TBool isCanvasReadyToBlit = EFalse;
- TBool isFullscreenUI = ETrue;
- if (content)
- {
- MMIDComponent::TType contentType = content->Type();
+ MMIDCanvas* canvas = GetCurrentCanvas();
+ TBool isCanvasReadyToBlit = canvas ? canvas->ReadyToBlit() : EFalse;
- if (contentType == MMIDComponent::ECanvas)
- {
- isCanvas = ETrue;
- MMIDCanvas* canvas = static_cast<MMIDCanvas*>(content);
- isCanvasReadyToBlit = canvas->ReadyToBlit();
- }
- else
- {
- if (contentType == MMIDComponent::EAlert ||
- (contentType == MMIDComponent::ETextBox &&
- iCurrentDisplayable->IsPopupTextBox()))
- {
- isFullscreenUI = EFalse;
- }
- }
- }
-
- if (!content || !isCanvas || isCanvasReadyToBlit)
+ if (!content || !canvas || isCanvasReadyToBlit)
{
if (iCurrentDisplayable)
{
iCurrentDisplayable->DrawNow();
}
-
- appUi->stopStartScreen(isFullscreenUI);
+ appUi->stopStartScreen();
}
}
}