--- a/uifw/AvKon/src/AknTransparentCameraSettingPage.cpp Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/AvKon/src/AknTransparentCameraSettingPage.cpp Tue Aug 31 15:28:30 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -17,6 +17,7 @@
*
*/
+
#include "AknTransparentCameraSettingPage.h"
// For icon support
@@ -172,15 +173,6 @@
BaseConstructL( KAknSettingPageNoEmbeddedSoftKeys );
SetDrawBackground(EFalse); // Enable transparent drawing
- if( CAknEnv::Static()->TransparencyEnabled() )
- {
- // try to enable window transparency
- if ( Window().SetTransparencyAlphaChannel() == KErrNone )
- {
- Window().SetRequiredDisplayMode( EColor16MA );
- Window().SetBackgroundColor( ~0 );
- }
- }
GenerateInternalArrayAndGiveToListBoxL();
@@ -225,16 +217,7 @@
// Set the current "pushed in" indication
if ( iCurrentSelectionIndex != -1 )
- {
- //
- // SelectItemL make the view item drawn by default, SetDisableRedraw can remove flick
- //
- TBool bRedrawDisabled = listBox->View()->RedrawDisabled();
- listBox->View()->SetDisableRedraw( ETrue );
-
- listBox->View()->SelectItemL( iCurrentSelectionIndex );
- listBox->View()->SetDisableRedraw( bRedrawDisabled );
- }
+ listBox->View()->SelectItemL( iCurrentSelectionIndex );
// Set the scroller indication off
listBox->CreateScrollBarFrameL(ETrue);
@@ -244,9 +227,7 @@
listBox->UpdateScrollBarsL();
if(!IsBackgroundDrawingEnabled())
- {
- listBox->ScrollBarFrame()->DrawBackground(EFalse, EFalse);
- }
+ listBox->ScrollBarFrame()->DrawBackground(EFalse, EFalse);
// Force a size changed
@@ -358,16 +339,9 @@
// Respond to softkey events
switch (aCommandId)
{
- case EAknSoftkeySelect:
- {
- if ( EnableSingleClickHighlight( aCommandId ) )
- {
- break;
- }
- // no single click mode was enabled, fall through
- }
case EAknSoftkeyOk:
- case EAknSoftkeyDone:
+ case EAknSoftkeySelect:
+ case EAknSoftkeyDone:
SelectCurrentItemL(); // has non-trivial implemenations in listbox type
// controls to put the selection on the current item
AttemptExitL(ETrue);
@@ -409,9 +383,7 @@
// Only in single click enabled applications.
if ( iExtension &&
iExtension->iFlags.IsSet(
- CAknTransparentCameraSettingPageExtension::ESingleClickEnabled ) &&
- iCurrentSelectionIndex >= 0 &&
- iCurrentSelectionIndex < ListBoxControl()->Model()->NumberOfItems() )
+ CAknTransparentCameraSettingPageExtension::ESingleClickEnabled ) )
{
ListBoxControl()->View()->SetCurrentItemIndex(
iCurrentSelectionIndex );
@@ -572,6 +544,13 @@
parentRect,
KAknsDrawParamDefault);
}
+ else
+ {
+ gc.SetBrushStyle(CGraphicsContext::ESolidBrush);
+ gc.SetPenStyle(CGraphicsContext::ENullPen);
+ gc.SetBrushColor(KRgbWhite);
+ gc.DrawRect (bgRect);
+ }
}
// draw viewfinder if available