FCL/sf/mw/classicui: comparison uifw/EikStd/coctlsrc/eikcba.cpp

equal deleted inserted replaced

-:2f259fa3e83a
+:8ca85d2f0db7
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <eiklabel.h>
 #include <eiksoftkeyimage.h>
 #include <eiksoftkeypostingtransparency.h>
 #include <eikbtgpc.h>
 #include <aknappui.h>
+#include <eikappui.h>
+#include <eikapp.h>
 #include <AknUtils.h> // LayoutUtils
 #include <aknlayoutscalable_apps.cdl.h>
 #include <AknsBasicBackgroundControlContext.h>
 #include <AknsMaskedLayerBackgroundControlContext.h>
 #include <AknsDrawUtils.h>
 iBackgroundMaskID = KAknsIIDNone;
 iCbaRect = TRect( 0,0,0,0 );
 iIfSkinChanged = EFalse;
 iIfMskIconSet = EFalse;
-iSemiBgID = KAknsIIDNone;
 if ( iOwner.Flags().IsSet( ECbaSingleClickEnabled ) )
 {
 AknItemActionMenuRegister::RegisterCollectionObserverL(
 *this );
 * Using the special theme Id draw background
 */
 void DrawSemiTransparencyL(CWindowGc& aGc,
 const TRect& aRect)
 	{
-	//Temporary inner rectangal value
+aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
-	TRect innerRect = aRect;
+aGc.SetBrushColor( TRgb(128, 128, 128, 64) );
-	innerRect.Shrink( 5, 5 );
+aGc.Clear();
-	if ( iSemiBgID != KAknsIIDNone )
-	        {
+TAknsItemID SemiButtonID = KAknsIIDQgnHomeButtonWidget;
-	        AknsDrawUtils::DrawFrame( AknsUtils::SkinInstance(),
+TAknsItemID SemiButtonCenterID = KAknsIIDQgnHomeButtonWidgetCenter;
-	            aGc, aRect, innerRect, iSemiBgID, iSemiBgCenterID );
+TAknsItemID SemiButtonPressedID = KAknsIIDQgnHomeButtonWidget;
-	        }
+TAknsItemID SemiButtonPressedCenterID = KAknsIIDQsnFrHomeCenterPressed;
+CEikCbaButton* button1 = static_cast<CEikCbaButton*>
+(iOwner.Control(KControlArrayCBAButton1Posn));
+CEikCbaButton* button2 = static_cast<CEikCbaButton*>
+(iOwner.Control(KControlArrayCBAButton2Posn));
+if (IsMskEnabledLayoutActive())
+{
+TRect innerRect = iMiddleFrameOuterRect;
+innerRect.Shrink(4, 4);
+CEikCbaButton* buttonMSK = static_cast<CEikCbaButton*>
+(iOwner.Control(KControlArrayCBAButtonMSKPosn));
+if (buttonMSK && buttonMSK->PressedDown())
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iMiddleFrameOuterRect,
+innerRect,//iMiddleFrameInnerRect,
+SemiButtonPressedID,
+SemiButtonPressedCenterID);
+}
+else
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iMiddleFrameOuterRect,
+innerRect,//iMiddleFrameInnerRect,
+SemiButtonID,
+SemiButtonCenterID);
+}
+}
+TRect innerRect = iLeftFrameOuterRect;
+innerRect.Shrink(4, 4);
+if (button1 && button1->PressedDown())
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iLeftFrameOuterRect,
+innerRect,//iLeftFrameInnerRect,
+SemiButtonPressedID,
+SemiButtonPressedCenterID);
+}
+else
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iLeftFrameOuterRect,
+innerRect,//iLeftFrameInnerRect,
+SemiButtonID,
+SemiButtonCenterID);
+}
+innerRect = iRightFrameOuterRect;
+innerRect.Shrink(4, 4);
+if (button2 && button2->PressedDown())
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iRightFrameOuterRect,
+innerRect,//iRightFrameInnerRect,
+SemiButtonPressedID,
+SemiButtonPressedCenterID);
+}
+else
+{
+AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
+iRightFrameOuterRect,
+innerRect,//iRightFrameInnerRect,
+SemiButtonID,
+SemiButtonCenterID);
+}
 	}
 public:
 CEikCba&               iOwner;
 CRepository*           iRepository;
 CCenRepNotifyHandler*  iCRListener;
 /**
 * Outer rect used in UpdateSoftkeyFrameL method.
 */
 TRect iUpdateFrameOuterRect;
-/*
-* Frame and center theme ID, using for semi-transparent
-*/
-TAknsItemID            iSemiBgID;
-TAknsItemID	           iSemiBgCenterID;
 /**
 * Inner rect used in UpdateSoftkeyFrameL method.
 */
 TRect iUpdateFrameInnerRect;
 iCbaFlags &= ~EEikCbaFlagTransparent;
 }
 }
 iExtension = CEikCbaExtension::NewL( *this );
-//create bitmap for semi-transparent background
-if ( iCbaFlags & EEikCbaFlagSemiTransparent && iExtension )
-{
-iExtension->iSemiBgID = KAknsIIDQsnHomeBgWidget;
-iExtension->iSemiBgCenterID = KAknsIIDQsnHomeBgWidgetCenter;
-}
 // Skin background is not drawn by embedded CBA.
 if ( !iFlags.IsSet( ECbaEmbedded ) )
 {
 TRect screen;
 if (aResourceId != KNoResource)
 {
 TResourceReader reader;
 iCoeEnv->CreateResourceReaderLC(reader, aResourceId);
 iCbaFlags = reader.ReadInt32();        // flags resource
+const TUid KActiveIdle2Uid = {0x102750F0};
+CEikApplication* app = CEikonEnv::Static()->EikAppUi()->Application();
+if ( app && app->AppDllUid() == KActiveIdle2Uid )
+{
+//it's intereting that the transparent can't not be set after the CBA was created for a while.
+//it just can be done in the CBA constructor, maybe some defect in Window server, but I'm not sure
+//about that, in order to fix the defect I have hardcode the transparent flag for homescreen the only usercase.
+//it should be fixed later.
+iCbaFlags |= EEikCbaFlagSemiTransparent;
+}
 // If using enhanced cba.
 if ( (iCbaFlags & EEikEnhancedButtonGroup) == EEikEnhancedButtonGroup )
 {
 #ifdef RD_ENHANCED_CBA
 //
 // NOTE: MSK is not supported in landscape.
 //
 if ( statusPane &&
 statusPane->IsVisible() &&
-AknStatuspaneUtils::ExtendedFlatLayoutActive() &&
+AknStatuspaneUtils::ExtendedFlatLayoutActive() )
-( iBgIID == KAknsIIDQsnBgAreaControl ||
+{
-iBgIID == KAknsIIDQsnBgAreaControlIdle ||
-iBgIID == KAknsIIDQsnBgAreaControlMp ||
-( iBgIID == KAknsIIDWallpaper &&
-AknStatuspaneUtils::IdleLayoutActive() ) ) )
-{
-TRect digitalClockRect( 0,0,0,0 );
-TRect indicatorRect( 0,0,0,0 );
 if ( iBgIID == KAknsIIDQsnBgAreaControlMp )
 {
 if ( !iIsClockIndicBgIIDSet )
 {
 statusPane->SetCbaAreaBackgroundID(
 iBgIID,
 CEikStatusPaneBase::EDrawDeferred );
 }
 }
-TRAPD( err1,
+if ( statusPane->PaneCapabilities(
-indicatorRect = statusPane->PaneRectL( TUid::Uid(
+TUid::Uid( EEikStatusPaneUidCombined ) ).IsInCurrentLayout() )
-EEikStatusPaneUidIndic ) ) );
+{
+TRect combinedPaneRect( 0, 0, 0, 0 );
-TRAPD( err2,
+TRAPD( err,
-digitalClockRect = statusPane->PaneRectL( TUid::Uid(
+combinedPaneRect =
-EEikStatusPaneUidDigitalClock ) ) );
+statusPane->PaneRectL( TUid::Uid(
+EEikStatusPaneUidCombined ) ) );
-if ( !err1 && !err2 )
-{
+if ( !err )
-TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() );
-TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() );
-if ( cbaRectRelativeToScreen.Intersects( indicatorRect ) )
 {
-indicatorRect.Move(
+TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() );
--cbaPositionRelativeToScreen.iX,
+TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() );
--cbaPositionRelativeToScreen.iY );
+if ( cbaRectRelativeToScreen.Intersects( combinedPaneRect ) )
-region.SubRect( indicatorRect );
+{
+combinedPaneRect.Move(
+-cbaPositionRelativeToScreen.iX,
+-cbaPositionRelativeToScreen.iY );
+region.SubRect( combinedPaneRect );
+}
 }
+}
+else
+{
+TRect digitalClockRect( 0, 0, 0, 0 );
+TRect indicatorRect( 0, 0, 0, 0 );
+TRAPD( err1,
+indicatorRect = statusPane->PaneRectL( TUid::Uid(
+EEikStatusPaneUidIndic ) ) );
+TRAPD( err2,
+digitalClockRect = statusPane->PaneRectL( TUid::Uid(
+EEikStatusPaneUidDigitalClock ) ) );
-if ( cbaRectRelativeToScreen.Intersects( digitalClockRect ) )
+if ( !err1 && !err2 )
 {
-digitalClockRect.Move(
+TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() );
--cbaPositionRelativeToScreen.iX,
+TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() );
--cbaPositionRelativeToScreen.iY );
+if ( cbaRectRelativeToScreen.Intersects( indicatorRect ) )
-region.SubRect( digitalClockRect );
+{
+indicatorRect.Move(
+-cbaPositionRelativeToScreen.iX,
+-cbaPositionRelativeToScreen.iY );
+region.SubRect( indicatorRect );
+}
+if ( cbaRectRelativeToScreen.Intersects( digitalClockRect ) )
+{
+digitalClockRect.Move(
+-cbaPositionRelativeToScreen.iX,
+-cbaPositionRelativeToScreen.iY );
+region.SubRect( digitalClockRect );
+}
 }
 }
 }
 if ( !region.CheckError() )
 }
 else
 {
 iCbaFlags &= ~EEikCbaFlagTransparent;
 }
-if ( iCbaFlags & EEikCbaFlagSemiTransparent )
-{
-if ( iExtension )
-{
-iExtension->iSemiBgID = KAknsIIDQsnHomeBgWidget;
-iExtension->iSemiBgCenterID = KAknsIIDQsnHomeBgWidgetCenter;
-}
-}
-else
-{
-if ( iExtension )
-{
-iExtension->iSemiBgID = KAknsIIDNone;
-iExtension->iSemiBgCenterID = KAknsIIDNone;
-}
-}
 UpdateFonts();
 }
 // -----------------------------------------------------------------------------
 (aKeyEvent.iModifiers & EModifierCtrl) ||
 (aKeyEvent.iModifiers & EModifierRightCtrl);
 TKeyResponse response(EKeyWasNotConsumed);
+CEikCbaButton* button1 =
+static_cast<CEikCbaButton*>(
+(*iControlArray)[KControlArrayCBAButton1Posn].iControl );
+CEikCbaButton* button2 =
+static_cast<CEikCbaButton*>(
+(*iControlArray)[KControlArrayCBAButton2Posn].iControl );
+CEikCbaButton* buttonMSK = NULL;
+if ( iMSKset && AknLayoutUtils::MSKEnabled() )
+{
+buttonMSK =
+static_cast<CEikCbaButton*>(
+(*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl );
+}
 // AknLaf - changed to use keys defined in AknKeys.h.
 // Left soft key will be returned also when MSK is enabled but not defined.
 if (aKeyEvent.iCode == EKeyCBA1)
 {
 if (KControlArrayCBAButton1Posn < iControlArray->Count())
 {
+if( button1->IsDimmed() )
+{
+return EKeyWasConsumed;
+}
 // Return immediately if the button is invisible
 if ( (*iControlArray)[KControlArrayCBAButton1Posn].iControl &&
 !(*iControlArray)[KControlArrayCBAButton1Posn].iControl->IsVisible() &&
 !(iCbaFlags & EAknCBAFlagRespondWhenInvisible) )
 {
 }
 else if (aKeyEvent.iCode == EKeyCBA2)
 {
 if (KControlArrayCBAButton2Posn < iControlArray->Count())
 {
+if( button2->IsDimmed() )
+{
+return EKeyWasConsumed;
+}
 // Return immediately if the button is invisible.
 if ( (*iControlArray)[KControlArrayCBAButton2Posn].iControl &&
 !(*iControlArray)[KControlArrayCBAButton2Posn].iControl->IsVisible() &&
 !(iCbaFlags&EAknCBAFlagRespondWhenInvisible) )
 {
 && AknLayoutUtils::MSKEnabled()
 && iMSKset
 && aKeyEvent.iCode == EKeyOK
 && !Window().IsFaded() )
 {
+if( buttonMSK->IsDimmed() )
+{
+return EKeyWasConsumed;
+}
 if (KControlArrayCBAButtonMSKPosn < iControlArray->Count())
 {
 // Return immediately if the button is invisible.
 if ( (*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl &&
 !(*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl->IsVisible() &&
 }
 // If hits the left softkey.
 if ( button1Rect.Contains( aPointerEvent.iPosition ) && !button1Empty )
 {
+if( button1->IsDimmed() )
+{
+	CCoeControl::HandlePointerEventL( aPointerEvent );
+	return;
+}
 if ( button1->IsVisible() )
 {
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 button1->SetPressedDown( ETrue );
 noHits = ETrue;
 }
 }
 else if ( button2Rect.Contains( aPointerEvent.iPosition ) && !button2Empty )
 {
+if( button2->IsDimmed() )
+{
+	CCoeControl::HandlePointerEventL( aPointerEvent );
+	return;
+}
 if ( button2->IsVisible() )
 {
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 button2->SetPressedDown( ETrue );
 }
 else if ( buttonMSK &&
 !buttonMSKEmpty &&
 buttonMSKRect.Contains( aPointerEvent.iPosition ) )
 {
+if( buttonMSK->IsDimmed() )
+{
+	CCoeControl::HandlePointerEventL( aPointerEvent );
+	return;
+}
 if  ( buttonMSK->IsVisible() )
 {
 if ( aPointerEvent.iType == TPointerEvent::EButton1Down )
 {
 buttonMSK->SetPressedDown( ETrue );
 // Embedded CBA doesn't draw anything
 if ( iFlags.IsSet( ECbaInsideDialog ) )
 {
 return;
 }
+if ( iCbaFlags & EEikCbaFlagSemiTransparent )
+{
+CWindowGc &gc = SystemGc();
+iExtension->DrawSemiTransparencyL( gc, Rect() );
+return;
+}
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 const TRect rect( Rect() );
 CWindowGc& gc = SystemGc();
-TRgb rgb( TRgb::Color16MA( 0 ) );
-gc.SetDrawMode( CGraphicsContext::EDrawModeWriteAlpha );
-gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
-gc.SetBrushColor( rgb );
-gc.Clear();
 MAknsControlContext* cc = iMLBgContext;
 if ( iFlags.IsSet( ECbaEmbedded ) )
 {
 // Embedded CBA is drawn inside dialog
 KAknsIIDQgnFrSctrlSkButton,
 KAknsIIDQgnFrSctrlSkButtonCenter );
 }
 }
 }
-else if ( ( iCbaFlags & EEikCbaFlagSemiTransparent) && iExtension )
-{
-if ( iExtension->iSemiBgID != KAknsIIDNone )
-{
-iExtension->DrawSemiTransparencyL( gc, rect );
-}
-}
 else
 {
 // No background since EEikCbaFlagTransparent is set.
 // Do nothing.
 }
 textVariety  = 0;
 graphVariety = 4;
 }
 if ( iExtension->iEnablePostingTransparency ||
-( iCbaFlags & EEikCbaFlagTransparent ) || ( iCbaFlags & EEikCbaFlagSemiTransparent ) )
+( iCbaFlags & EEikCbaFlagTransparent ) )
 {
 textVariety = 6; // Outline font used
 }
 // This uses correct coordinates to calculate the positions of softkey labels.
 rect,
 AKN_LAYOUT_WINDOW_Control_pane_elements_Line_1 );
 }
 TInt textMSKVariety = 3;
-TInt graphicMSKVariety = 0;
+TInt graphicMSKVariety = 1;
 if ( mskEnabledInApplication && mskEnabledInPlatform )
 {
 MSKSoftkey = (*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl;
 MSKButton = static_cast<CEikCbaButton*>( MSKSoftkey );
 }
 }
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 const TBool transparentSoftkeys =
-iExtension->iEnablePostingTransparency ||
+iExtension->iEnablePostingTransparency || ( iCbaFlags & EEikCbaFlagTransparent );
-( iCbaFlags & EEikCbaFlagTransparent ) ||
-( iCbaFlags & EEikCbaFlagSemiTransparent );
 TRgb leftColor;
 TRgb rightColor;
 TRgb MSKColor;
 TInt errorl;
 TInt errorr;
 // Right pane:
 TInt rightPaneTextVariety = 0;
 if ( iExtension->iEnablePostingTransparency ||
-( iCbaFlags & EEikCbaFlagTransparent ) || ( iCbaFlags & EEikCbaFlagSemiTransparent ) )
+( iCbaFlags & EEikCbaFlagTransparent ) )
 {
 rightPaneTextVariety = 1; // Outline font used
 }
 TAknTextLineLayout rightPaneTextLayout(
 TAknLayoutRect qgn_graf_sk_msk;
 TRect rect;
 qgn_graf_sk_msk.LayoutRect(
 rect,
-AknLayoutScalable_Avkon::control_pane_g4( 0 ).LayoutLine() );
+AknLayoutScalable_Avkon::control_pane_g4( 1 ).LayoutLine() );
 TSize iconSize( qgn_graf_sk_msk.Rect().Width(),
 qgn_graf_sk_msk.Rect().Height() );
 AknsUtils::CreateIconL(

branch	RCL_3
changeset 4	8ca85d2f0db7
parent 0	2f259fa3e83a
child 9	aabf2c525e0f