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

equal deleted inserted replaced

-:0aa5fbdfbc30
+:3d340a0166ff
 #include <AknTasHook.h>
 #include <akncbacontentobserver.h>
 #include <aknitemactionmenu.h>
 #include "akncollectionobserver.h"
 #include "aknitemactionmenuregister.h"
+#include "aknmarkingmode.h"
 #include "akntrace.h"
 /**
 * Color value for transparent pixel (ARGB format).
 */
 const TUint32 KAknCbaColorKey = 0x00000000;
 ECbaParentAsControl, // cba's parent window group is treated as CCoeControl
 ECbaActivationDelayed, // activation delayed
 ECbaSingleClickEnabled, // single click enabled in appUi
 ECbaItemSoftkeyDisabled, // item specific softkey disabled
 ECbaItemSpecificSoftkeyInUse, // item specific softkey is in use
-ECbaItemSoftkeyDisabledByClient // client has disabled item specific softkey
+ECbaItemSoftkeyDisabledByClient, // client disabled item specific softkey
+ECbaMultipleMarkingActive // multiple marking has changed RSK
 };
 enum TCbaLayers
 {
 ECbaLayerWallpaper,
 aRightButton );
 _AKNTRACE_FUNC_EXIT;
 }
 /**
+* Returns ETrue if the command cancels multiple marking and should not
+* be forwarded to actual command observer.
+*
+* @return ETrue if multiple marking was cancelled.
+*/
+TBool CancelMultipleMarking( TInt aCommandId )
+{
+_AKNTRACE_FUNC_ENTER;
+TBool cancelled( EFalse );
+if ( aCommandId == EAknSoftkeyCancel
+&& iItemActionMenu
+&& iOwner.Flags().IsSet( ECbaMultipleMarkingActive ) )
+{
+iItemActionMenu->MarkingMode().SetCollectionMultipleMarkingState(
+EFalse );
+cancelled = ETrue;
+}
+_AKNTRACE_FUNC_EXIT;
+return cancelled;
+}
+/**
 * From MAknCollectionObserver.
 * This method is used to set the item action menu to observer.
 *
 * @param aItemActionMenu Item action menu.
 */
 if ( aCollectionVisible
 || iOwner.Flags().IsClear( ECbaItemSoftkeyDisabled ) )
 {
 iOwner.UpdateItemSpecificSoftkey();
 }
+iOwner.UpdateMultipleMarkingSoftkey();
 _AKNTRACE_FUNC_EXIT;
 }
 /**
 * From MAknCollectionObserver.
 }
 /*
 * Using the special theme Id draw background
 */
-void DrawSemiTransparency( CWindowGc& aGc,
+void DrawSemiTransparency( CWindowGc& aGc )
-const TRect& aRect )
 {
 _AKNTRACE_FUNC_ENTER;
-aGc.SetBrushStyle( CGraphicsContext::ESolidBrush );
-aGc.SetBrushColor( TRgb(128, 128, 128, 64) );
+TAknsItemID SemiButtonID              = KAknsIIDQgnFrSctrlSkButton;
-aGc.Clear();
+TAknsItemID SemiButtonCenterID        = KAknsIIDQgnFrSctrlSkButtonCenter;
+TAknsItemID SemiButtonPressedID       = KAknsIIDQgnFrSctrlSkButtonPressed;
-TAknsItemID SemiButtonID = KAknsIIDQgnHomeButtonWidget;
+TAknsItemID SemiButtonPressedCenterID = KAknsIIDQgnFrSctrlSkButtonCenterPressed;
-TAknsItemID SemiButtonCenterID = KAknsIIDQgnHomeButtonWidgetCenter;
-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,
+iMiddleFrameInnerRect,
 SemiButtonPressedID,
 SemiButtonPressedCenterID);
 }
 else
 {
 AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
 iMiddleFrameOuterRect,
-innerRect,//iMiddleFrameInnerRect,
+iMiddleFrameInnerRect,
 SemiButtonID,
 SemiButtonCenterID);
 }
 }
-TRect innerRect = iLeftFrameOuterRect;
-innerRect.Shrink(4, 4);
 if (button1 && button1->PressedDown())
 {
 AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
 iLeftFrameOuterRect,
-innerRect,//iLeftFrameInnerRect,
+iLeftFrameInnerRect,
 SemiButtonPressedID,
 SemiButtonPressedCenterID);
 }
 else
 {
 AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
 iLeftFrameOuterRect,
-innerRect,//iLeftFrameInnerRect,
+iLeftFrameInnerRect,
 SemiButtonID,
 SemiButtonCenterID);
 }
-innerRect = iRightFrameOuterRect;
-innerRect.Shrink(4, 4);
 if (button2 && button2->PressedDown())
 {
 AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
 iRightFrameOuterRect,
-innerRect,//iRightFrameInnerRect,
+iRightFrameInnerRect,
 SemiButtonPressedID,
 SemiButtonPressedCenterID);
 }
 else
 {
 AknsDrawUtils::DrawFrame(AknsUtils::SkinInstance(), aGc,
 iRightFrameOuterRect,
-innerRect,//iRightFrameInnerRect,
+iRightFrameInnerRect,
 SemiButtonID,
 SemiButtonCenterID);
 }
 _AKNTRACE_FUNC_EXIT;
 }
 (*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl->ActivateL();
 }
 }
 }
-// Set CBA faded in case the softkeys are empty.
-SetFadeState();
 _AKNTRACE_FUNC_EXIT;
 }
 void CEikCba::ConstructFromResourceL(TResourceReader& aReader)
 {
 (*iControlArray)[KControlArrayCBAButtonMSKPosn].iControl->ActivateL();
 }
 }
-// Set CBA faded in case the softkeys are empty.
-SetFadeState();
 _AKNTRACE_FUNC_EXIT;
 }
 TInt CEikCba::MaxCommands() const
 const TDesC* aText,
 const CFbsBitmap* /*aBitmap*/,
 const CFbsBitmap* /*aMask*/ )
 {
 _AKNTRACE_FUNC_ENTER;
-// We need to check if this call changes the softkeys from being
-// empty to having a command or vice versa to be able to maintain
-// correct fade state.
-TBool isEmptyBefore( IsEmpty() );
 TEikGroupControl& groupCtrl = (*iControlArray)[aPosition];
 groupCtrl.iId = aCommandId;
 groupCtrl.iLongId = 0;
 if ( !iFlags.IsSet( ECbaInsideDialog ) )
 {
 CAknButton* button = static_cast<CAknButton*>( groupCtrl.iControl );
 CAknCommandButtonState* buttonState =
 static_cast<CAknCommandButtonState*>( button->State() );
 buttonState->SetTextL( *aText );
 buttonState->SetCommand( aCommandId );
-}
-TBool isEmptyAfter( IsEmpty() );
-if ( !COMPARE_BOOLS( isEmptyBefore, isEmptyAfter ) )
-{
-SetFadeState();
 }
 ReportContentChangedEvent();
 _AKNTRACE_FUNC_EXIT;
 }
 void CEikCba::AddCommandToStackWithoutSizeChangedL(TInt aPosition,
 TInt aCommandId,
 const TDesC* aText)
 {
 _AKNTRACE_FUNC_ENTER;
-// We need to check if this call changes the softkeys from being
-// empty to having a command or vice versa to be able to maintain
+if ( !CommandChangeAllowed() )
-// correct fade state.
+{
-TBool isEmptyBefore( IsEmpty() );
+_AKNTRACE_FUNC_EXIT;
+return;
+}
 TEikGroupControl& groupCtrl = (*iControlArray)[aPosition];
 if ( iFlags.IsSet( ECbaInsideDialog ) )
 {
 if ( aPosition == KControlArrayCBAButtonMSKPosn )
 {
 iMSKset = ETrue;
 }
 SetMSKIconL(); // If MSK id was changed, this sets MSK icon accordingly.
-TBool isEmptyAfter( IsEmpty() );
-if ( !COMPARE_BOOLS( isEmptyBefore, isEmptyAfter ) )
-{
-SetFadeState();
-}
 ReportContentChangedEvent();
 _AKNTRACE_FUNC_EXIT;
 }
 // Force labels to be re-formatted...
 SizeChanged();
 TBool isEmptyAfter( IsEmpty() );
-if ( !COMPARE_BOOLS( isEmptyBefore, isEmptyAfter ) )
-{
-SetFadeState();
-}
 DrawDeferred();
 ReportContentChangedEvent();
 _AKNTRACE_FUNC_EXIT;
 }
 _AKNTRACE_FUNC_ENTER;
 iCbaFlags = aFlags;
 //has not supported semi-transparent, ignore the flag at this moment.
 //TODO: if the tranparent style CBA is approved and the new icon was delivered, open it again.
-iCbaFlags &= ~EEikCbaFlagSemiTransparent;
+//steven yao
+//iCbaFlags &= ~EEikCbaFlagSemiTransparent;
 if (( iCbaFlags & EEikCbaFlagTransparent || iCbaFlags & EEikCbaFlagSemiTransparent ) &&
 CAknEnv::Static()->TransparencyEnabled() )
 {
 Window().SetRequiredDisplayMode( EColor16MA );
 return EKeyWasNotConsumed;
 }
 if (aKeyEvent.iRepeats == 0 && shortCommand)
 {
-iCommandObserver->ProcessCommandL((TInt)shortCommand);
+// Notify command observer only if multiple marking
+// was not cancelled
+if ( !iExtension || !iExtension->CancelMultipleMarking(
+shortCommand ) )
+{
+iCommandObserver->ProcessCommandL( ( TInt ) shortCommand );
+}
 }
 else if (longCommand)
 {
 iCommandObserver->ProcessCommandL((TInt)longCommand);
 }
 iMSKCommandObserver->ProcessCommandL( shortCommand );
 }
 if( shortCommand )
 {
-iCommandObserver->ProcessCommandL( shortCommand );
+// Notify command observer only if multiple marking
+// was not cancelled
+if ( !iExtension || !iExtension->CancelMultipleMarking(
+shortCommand ) )
+{
+iCommandObserver->ProcessCommandL( shortCommand );
+}
 }
 break;
 }
 }
 }
 case KEikMessageUnfadeWindows:
 {
 DoLayoutChange();
-SetFadeState();
 if ( iFlags.IsSet( ECbaInsideDialog ) )
 {
 DrawDeferred();
 }
 {
 if ( AknLayoutUtils::PenEnabled() &&
 AknStatuspaneUtils::IdleLayoutActive() )
 {
 SetMSKVisibility( MskAllowed() );
 }
-SetFadeState();
 break;
 }
 default:
 {
 if ( iFlags.IsSet( ECbaInsideDialog ) )
 {
 return;
 }
-//    if ( iCbaFlags & EEikCbaFlagSemiTransparent )
+if ( iCbaFlags & EEikCbaFlagSemiTransparent )
-//        {
+{
-//        CWindowGc &gc = SystemGc();
+CWindowGc &gc = SystemGc();
-//
-//        iExtension->DrawSemiTransparency( gc, Rect() );
+iExtension->DrawSemiTransparency( gc );
-//        return;
+return;
-//        }
+}
 MAknsSkinInstance* skin = AknsUtils::SkinInstance();
 const TRect rect( Rect() );
 CWindowGc& gc = SystemGc();
 gc.BitBlt( rightSKRect.iTl, iExtension->iRskPostingOverlayBitmap,
 TRect( rightSKSize ) );
 gc.BitBlt( leftSKRect.iTl, iExtension->iLskPostingOverlayBitmap,
 TRect( leftSKSize ) );
 }
-else if ( !( ( iCbaFlags & EEikCbaFlagTransparent) || ( iCbaFlags & EEikCbaFlagSemiTransparent))  )
+else if ( !( iCbaFlags & EEikCbaFlagTransparent ) )
 {// Old way to render
 if( !AknsDrawUtils::Background( skin, cc, this, gc, rect ) )
 {
 gc.SetPenStyle( CGraphicsContext::ENullPen );
 gc.SetBrushStyle( CGraphicsContext::ESolidBrush );
 gc.BitBlt( topSKRect.iTl, iExtension->iRskPostingOverlayBitmap,
 TRect( topSKRect.Size() ) );
 gc.BitBlt( bottomSKRect.iTl, iExtension->iLskPostingOverlayBitmap,
 TRect( bottomSKRect.Size() ) );
 }
-else if ( !( ( iCbaFlags & EEikCbaFlagTransparent) || ( iCbaFlags & EEikCbaFlagSemiTransparent))  )
+else if ( !( iCbaFlags & EEikCbaFlagTransparent) )
 {
 // Old way to render
 if( !AknsDrawUtils::Background( skin, cc, this, gc, rect ) )
 {
 gc.SetPenStyle( CGraphicsContext::ENullPen );
 _AKNTRACE_FUNC_ENTER;
 TRect screen;
 AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, screen );
 TBool isLandscape( Layout_Meta_Data::IsLandscapeOrientation() );
-TBool flatLscLayout( isLandscape &&
+TInt spLayout( AknStatuspaneUtils::CurrentStatusPaneLayoutResId() );
-AknStatuspaneUtils::FlatLayoutActive() );
+// Treat the empty status pane layout the same way as the flat layout
+// in landscape orientation, as the CBA layout is the same in both.
+TBool flatLscLayout(
+isLandscape &&
+( spLayout == R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT ||
+spLayout == R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT ||
+spLayout == R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT ||
+spLayout == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT ||
+spLayout == R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT_NO_SOFTKEYS ||
+spLayout == R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS ||
+spLayout == R_AVKON_STATUS_PANE_LAYOUT_EMPTY ) );
 // We must check for landscape mode bottom softkeys.
 TInt bottomPaneVariety = isLandscape ? ( flatLscLayout ? 2 : 6 ) : 1;
+// Skip application_window between screen and area_bottom_pane since
+// screen and application_window are always the same.
 TAknWindowComponentLayout controlPane(
 DoCompose(
-AknLayoutScalable_Avkon::application_window( 0 ),
+AknLayoutScalable_Avkon::area_bottom_pane( bottomPaneVariety ),
-DoCompose(
+AknLayoutScalable_Avkon::control_pane() ) );
-AknLayoutScalable_Avkon::area_bottom_pane( bottomPaneVariety ),
-AknLayoutScalable_Avkon::control_pane() ) ) );
 TAknLayoutRect cbarect;
 cbarect.LayoutRect( screen, controlPane.LayoutLine() );
 TRect rect( cbarect.Rect().Size() );
 TBool mskEnabledInApplication( AknLayoutUtils::MSKEnabled() && iMSKset );
 // Set the softkey frame rectangles in touch layouts.
 if ( iExtension && AknLayoutUtils::PenEnabled() )
 {
 TAknLayoutRect layoutRect;
 TBool frameSizeChanged( EFalse );
 if ( mskEnabledInPlatform || flatLscLayout )
 {
 _AKNTRACE_FUNC_EXIT;
 }
 // ---------------------------------------------------------------------------
-// CEikCba::SetFadeState
-// Sets the CBA faded if it's contents are empty.
-// ---------------------------------------------------------------------------
-//
-void CEikCba::SetFadeState()
-{
-_AKNTRACE_FUNC_ENTER;
-TBool canBeFaded =
-IsEmpty() && !( ( iCbaFlags & EEikCbaFlagTransparent )
-|| ( iExtension && iExtension->iEnablePostingTransparency ) );
-// No unfading when system is faded
-if ( !( !canBeFaded
-&& static_cast<CAknAppUi*>( iCoeEnv->AppUi() )->IsFaded() ) )
-{
-Window().SetFaded( canBeFaded, RWindowTreeNode::EFadeIncludeChildren );
-}
-_AKNTRACE_FUNC_EXIT;
-}
-// ---------------------------------------------------------------------------
 // CEikCba::UpdateLabels
 // Updates softkey labels in case of embedded softkeys.
 // ---------------------------------------------------------------------------
 //
 void CEikCba::UpdateLabels( TBool aDrawDeferred )
 }
 _AKNTRACE_FUNC_EXIT;
 }
+// ---------------------------------------------------------------------------
+// CEikCba::UpdateMultipleMarkingSoftkey
+// Updates RSK when multiple marking is activated or deactivated.
+// ---------------------------------------------------------------------------
+//
+void CEikCba::UpdateMultipleMarkingSoftkey()
+{
+_AKNTRACE_FUNC_ENTER;
+if ( iFlags.IsSet( ECbaSingleClickEnabled )
+&& iExtension && iExtension->iItemActionMenu )
+{
+TBool markingActive(
+iExtension->iItemActionMenu->MarkingMode(
+).MultipleMarkingActive() );
+TBool markingActivated( iFlags.IsSet( ECbaMultipleMarkingActive ) );
+if ( markingActive && !markingActivated )
+{
+TRAPD( error,
+AddCommandSetToStackL( R_AVKON_SOFTKEYS_OPTIONS_CANCEL ) );
+if ( error == KErrNone )
+{
+iFlags.Set( ECbaMultipleMarkingActive );
+}
+}
+else if ( !markingActive && markingActivated )
+{
+RemoveCommandFromStack(
+KControlArrayCBAButton1Posn, EAknSoftkeyOptions );
+RemoveCommandFromStack(
+KControlArrayCBAButton2Posn, EAknSoftkeyCancel );
+iFlags.Clear( ECbaMultipleMarkingActive );
+}
+}
+_AKNTRACE_FUNC_EXIT;
+}
+// ---------------------------------------------------------------------------
+// CEikCba::CommandChangeAllowed
+//
+// ---------------------------------------------------------------------------
+//
+TBool CEikCba::CommandChangeAllowed()
+{
+if ( iFlags.IsSet( ECbaSingleClickEnabled )
+&& iFlags.IsSet( ECbaMultipleMarkingActive ) )
+{
+return EFalse;
+}
+return ETrue;
+}
 //
 // class CEikCbaButton
 //
 CEikCbaButton::~CEikCbaButton()

branch	RCL_3
changeset 23	3d340a0166ff
parent 16	71dd06cfe933
child 25	941195f2d488