equal
deleted
inserted
replaced
56 #include <AknTasHook.h> |
56 #include <AknTasHook.h> |
57 |
57 |
58 #include <touchfeedback.h> |
58 #include <touchfeedback.h> |
59 #include <aknitemactionmenu.h> |
59 #include <aknitemactionmenu.h> |
60 #include "aknitemactionmenuregister.h" |
60 #include "aknitemactionmenuregister.h" |
61 #include <aknPriv.hrh> |
61 #include <AknPriv.hrh> |
62 #include "akntrace.h" |
62 #include "akntrace.h" |
63 |
63 |
64 enum { EEikMenuBarTitleArrayGranularity=10 }; |
64 enum { EEikMenuBarTitleArrayGranularity=10 }; |
65 enum { EEikMenuBarPosArrayGranularity=2 }; |
65 enum { EEikMenuBarPosArrayGranularity=2 }; |
66 const TInt KExtraBaselineOffsetForFirstPaneItem=4; |
66 const TInt KExtraBaselineOffsetForFirstPaneItem=4; |
423 } |
423 } |
424 |
424 |
425 inline void CEikMenuBar::SetMenuHasItems() |
425 inline void CEikMenuBar::SetMenuHasItems() |
426 { |
426 { |
427 iMenuFlags|=EMenuHasItems; |
427 iMenuFlags|=EMenuHasItems; |
428 iExt->StoreCollectionHighlightValue(); |
|
429 } |
428 } |
430 |
429 |
431 inline TBool CEikMenuBar::MenuHasPane() const |
430 inline TBool CEikMenuBar::MenuHasPane() const |
432 { |
431 { |
433 return iMenuFlags&EMenuHasPane; |
432 return iMenuFlags&EMenuHasPane; |
647 } |
646 } |
648 } |
647 } |
649 SPosition menuPos; |
648 SPosition menuPos; |
650 menuPos.iMenuId = iMenuTitleResourceId; |
649 menuPos.iMenuId = iMenuTitleResourceId; |
651 menuPos.iMenuCursorPos = iCursor; |
650 menuPos.iMenuCursorPos = iCursor; |
652 iPastMenuPosArray->AppendL(&menuPos, sizeof(menuPos)); |
651 iPastMenuPosArray->AppendL(menuPos); |
653 } |
652 } |
654 |
653 |
655 void CEikMenuBar::SetCursorPositionFromArray() |
654 void CEikMenuBar::SetCursorPositionFromArray() |
656 //Set cursor position |
655 //Set cursor position |
657 //Check position array to see if menu previously displayed and use that last position. |
656 //Check position array to see if menu previously displayed and use that last position. |
956 iMenuObserver->SetEmphasis(this,EFalse); |
955 iMenuObserver->SetEmphasis(this,EFalse); |
957 iTitleArray->ResetAndDestroy(); |
956 iTitleArray->ResetAndDestroy(); |
958 iMenuPane->Close(); |
957 iMenuPane->Close(); |
959 return; |
958 return; |
960 } |
959 } |
|
960 |
|
961 iExt->StoreCollectionHighlightValue(); |
961 |
962 |
962 if (!(iMenuFlags&EBackgroundFaded)) |
963 if (!(iMenuFlags&EBackgroundFaded)) |
963 { |
964 { |
964 iExt->FadeBehindPopup(ETrue); |
965 iExt->FadeBehindPopup(ETrue); |
965 iMenuFlags |= EBackgroundFaded; |
966 iMenuFlags |= EBackgroundFaded; |